Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 27 Feb 2018 09:45:20 +0000 (20:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 27 Feb 2018 09:45:33 +0000 (20:45 +1100)
1  2 
source/blender/gpu/intern/gpu_select_pick.c

index 2d36c6f120c69f29a22489daabf2eacfc7dca360,bd6b43ee42fdbf8857a6f3a78eb32cecf16528a5..8c102a307eae29fe851bc481150da03978ff33d8
@@@ -546,9 -551,11 +549,11 @@@ unsigned int gpu_select_pick_end(void
  #endif
  
        if (ps->is_cached == false) {
-               gpu_select_pick_finalize();
+               if (ps->gl.is_finalized == false) {
+                       gpu_select_pick_finalize();
+               }
  
 -              glPopAttrib();
 +              gpuPopAttrib();
                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
        }