Commit: b5cc55c8220480ee1b17405265512d9a16f46004
Author: Campbell Barton
Date: Thu Mar 1 16:48:13 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBb5cc55c8220480ee1b17405265512d9a16f46004
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/gpu/intern/gpu_select_pick.c
index 9aff708d32a,3e65e2987e6..4aef80934ad
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@@ -552,11 -538,11 +536,11 @@@ 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();
+ gpuPopAttrib();
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
