[Bf-blender-cvs] [aa592cc00cb] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: aa592cc00cb4d434afec53dd5c3869d19bb48327
Author: Campbell Barton
Date:   Tue Feb 27 20:45:20 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBaa592cc00cb4d434afec53dd5c3869d19bb48327

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/gpu/intern/gpu_select_pick.c
index 2d36c6f120c,bd6b43ee42f..8c102a307ea
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@@ -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);
  	}