Merge branch 'master' into blender2.8

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 9aff708d32a..4aef80934ad 100644
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@ -257,7 +257,6 @@ typedef struct GPUPickState {
 
 		/* Set after first draw */
 		bool is_init;
-		bool is_finalized;
 		uint prev_id;
 	} gl;
 
@@ -368,7 +367,6 @@ void gpu_select_pick_begin(
 #endif
 
 		ps->gl.is_init = false;
-		ps->gl.is_finalized = false;
 		ps->gl.prev_id = 0;
 	}
 	else {
@@ -529,20 +527,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;
@@ -552,10 +536,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);
 		}
-
 		gpuPopAttrib();
 		glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 	}