Commit: efef0ee672d5a65c8cb4a37f2837a371def6daaa
Author: Campbell Barton
Date: Tue Feb 27 20:22:26 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBefef0ee672d5a65c8cb4a37f2837a371def6daaa
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/gpu/intern/gpu_select_pick.c
index f1d311890e6,d7a3ad07558..2d36c6f120c
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@@ -533,12 -548,9 +546,9 @@@ unsigned int gpu_select_pick_end(void
#endif
if (ps->is_cached == false) {
- if (ps->gl.is_init) {
- /* force finishing last pass */
- gpu_select_pick_load_id(ps->gl.prev_id);
- }
+ gpu_select_pick_finalize();
- 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
