diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-14 10:17:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-14 10:17:00 +0300 |
| commit | 26efc7bbd1d15bfea9c1bd0538a27d13c9620f3b (patch) | |
| tree | 735af15bb380cf8dcc85b609cc5cc46ea8c9f9dc /source/blender/gpu/intern/gpu_select.c | |
| parent | a394d681775cc9f5e83a28fb12c0d6aba1a6681c (diff) | |
| parent | 2462320210fa6b625ebbcd0ddde770fc2d4e2155 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_select.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_select.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index c384fa01fc6..162a605ef3d 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -75,6 +75,12 @@ static GPUSelectState g_select_state = {0}; */ void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, const rcti *input, char mode, int oldhits) { + if (mode == GPU_SELECT_NEAREST_SECOND_PASS) { + /* In the case hits was '-1', don't start the second pass since it's not going to give useful results. + * As well as buffer overflow in 'gpu_select_query_load_id'. */ + BLI_assert(oldhits != -1); + } + g_select_state.select_is_active = true; g_select_state.use_gpu_select = GPU_select_query_check_active(); g_select_state.mode = mode; |