a412268980
Fixes Overlay-Next selection when multiple objects are hit. To reproduce: - enable "Ovlay Next" in Preferences>Experimental - create any Empty object and duplicate it without moving - try to select by clicking them Crash occurs because `mixed_bones_object_selectbuffer` in `view3d_select.cc` expects that `view3d_opengl_select_ex` will append results to `buffer`. Depending on situation after several `view3d_opengl_select_ex`calls with decreasing radius it tries to `slice` results from buffer: ```c has_bones9 = selectbuffer_has_bones(storage.as_span().slice(ofs, hits9)); ``` Pull Request: https://projects.blender.org/blender/blender/pulls/124154
85 lines
2.1 KiB
C++
85 lines
2.1 KiB
C++
/* SPDX-FileCopyrightText: 2017 Blender Authors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup gpu
|
|
*
|
|
* Glue to make the new Select-Next engine work with the old GPU select API.
|
|
*/
|
|
#include <cfloat>
|
|
|
|
#include "BLI_rect.h"
|
|
#include "BLI_span.hh"
|
|
|
|
#include "GPU_select.hh"
|
|
|
|
#include "gpu_select_private.hh"
|
|
|
|
struct GPUSelectNextState {
|
|
/** Result buffer set on initialization. */
|
|
GPUSelectBuffer *buffer;
|
|
/** Area of the viewport to render / select from. */
|
|
rcti rect;
|
|
/** Number of hits. Set to -1 if it overflows buffer_len. */
|
|
uint hits;
|
|
/** Mode of operation. */
|
|
eGPUSelectMode mode;
|
|
};
|
|
|
|
static GPUSelectNextState g_state = {};
|
|
|
|
void gpu_select_next_begin(GPUSelectBuffer *buffer, const rcti *input, eGPUSelectMode mode)
|
|
|
|
{
|
|
g_state.buffer = buffer;
|
|
g_state.rect = *input;
|
|
g_state.mode = mode;
|
|
}
|
|
|
|
int gpu_select_next_get_pick_area_center()
|
|
{
|
|
BLI_assert(BLI_rcti_size_x(&g_state.rect) == BLI_rcti_size_y(&g_state.rect));
|
|
return BLI_rcti_size_x(&g_state.rect) / 2;
|
|
}
|
|
|
|
eGPUSelectMode gpu_select_next_get_mode()
|
|
{
|
|
return g_state.mode;
|
|
}
|
|
|
|
void gpu_select_next_set_result(GPUSelectResult *hit_buf, uint hit_len)
|
|
{
|
|
const int old_size = g_state.buffer->storage.size();
|
|
g_state.buffer->storage.resize(old_size + hit_len);
|
|
blender::MutableSpan<GPUSelectResult> hit_results =
|
|
g_state.buffer->storage.as_mutable_span().slice(old_size, hit_len);
|
|
const blender::Span<GPUSelectResult> hits(hit_buf, hit_len);
|
|
|
|
/* TODO(fclem): There might be some conversion to do to align to the other APIs output. */
|
|
switch (g_state.mode) {
|
|
case eGPUSelectMode::GPU_SELECT_ALL:
|
|
hit_results.copy_from(hits);
|
|
break;
|
|
case eGPUSelectMode::GPU_SELECT_NEAREST_FIRST_PASS:
|
|
hit_results.copy_from(hits);
|
|
break;
|
|
case eGPUSelectMode::GPU_SELECT_NEAREST_SECOND_PASS:
|
|
hit_results.copy_from(hits);
|
|
break;
|
|
case eGPUSelectMode::GPU_SELECT_PICK_ALL:
|
|
hit_results.copy_from(hits);
|
|
break;
|
|
case eGPUSelectMode::GPU_SELECT_PICK_NEAREST:
|
|
hit_results.copy_from(hits);
|
|
break;
|
|
}
|
|
|
|
g_state.hits = hit_len;
|
|
}
|
|
|
|
uint gpu_select_next_end()
|
|
{
|
|
return g_state.hits;
|
|
}
|