diff options
Diffstat (limited to 'source/blender/gpu/intern/gpu_select_pick.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_select_pick.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/source/blender/gpu/intern/gpu_select_pick.c b/source/blender/gpu/intern/gpu_select_pick.c index 703035483dd..3e65e2987e6 100644 --- a/source/blender/gpu/intern/gpu_select_pick.c +++ b/source/blender/gpu/intern/gpu_select_pick.c @@ -255,7 +255,6 @@ typedef struct GPUPickState { /* Set after first draw */ bool is_init; - bool is_finalized; uint prev_id; } gl; @@ -370,7 +369,6 @@ void gpu_select_pick_begin( #endif ps->gl.is_init = false; - ps->gl.is_finalized = false; ps->gl.prev_id = 0; } else { @@ -531,20 +529,6 @@ bool gpu_select_pick_load_id(uint id) return true; } - /** - * (Optional), call before 'gpu_select_pick_end' if GL context is not kept. - * is not compatible with regular select case. - * */ -void gpu_select_pick_finalize(void) -{ - GPUPickState *ps = &g_pick_state; - if (ps->gl.is_init) { - /* force finishing last pass */ - gpu_select_pick_load_id(ps->gl.prev_id); - } - ps->gl.is_finalized = true; -} - uint gpu_select_pick_end(void) { GPUPickState *ps = &g_pick_state; @@ -554,10 +538,10 @@ uint gpu_select_pick_end(void) #endif if (ps->is_cached == false) { - if (ps->gl.is_finalized == false) { - gpu_select_pick_finalize(); + if (ps->gl.is_init) { + /* force finishing last pass */ + gpu_select_pick_load_id(ps->gl.prev_id); } - glPopAttrib(); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } |