[Bf-blender-cvs] [bbfa1a86391] blender2.8: Viewport: 3D cameras don't need glPushAttrib/glPopAttrib

Dalai Felinto noreply at git.blender.org
Wed Apr 5 15:04:59 CEST 2017


Commit: bbfa1a8639114d66ed0c4971a1996e08e520bd06
Author: Dalai Felinto
Date:   Wed Apr 5 12:31:55 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBbbfa1a8639114d66ed0c4971a1996e08e520bd06

Viewport: 3D cameras don't need glPushAttrib/glPopAttrib

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

M	source/blender/editors/space_view3d/drawobject.c

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

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index fc28baf5160..eaa5ee3b9eb 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2009,7 +2009,6 @@ static void drawcamera_stereo3d(
 
 	if (is_stereo3d_cameras) {
 		/* draw connecting lines */
-		glPushAttrib(GL_ENABLE_BIT); /* TODO(merwin): new state tracking! */
 		glLineStipple(2, 0xAAAA);
 		glEnable(GL_LINE_STIPPLE);
 
@@ -2018,7 +2017,7 @@ static void drawcamera_stereo3d(
 		immVertex3fv(pos, origin[1]);
 		immEnd();
 
-		glPopAttrib();
+		glDisable(GL_LINE_STIPPLE);
 	}
 
 	/* draw convergence plane */




More information about the Bf-blender-cvs mailing list