[Bf-blender-cvs] [24b2987] master: Fix GL regression from D1645

Campbell Barton noreply at git.blender.org
Mon Jan 11 01:31:29 CET 2016


Commit: 24b29873ecae0cccde7fe5a060e2d7543c94f969
Author: Campbell Barton
Date:   Mon Jan 11 11:23:18 2016 +1100
Branches: master
https://developer.blender.org/rB24b29873ecae0cccde7fe5a060e2d7543c94f969

Fix GL regression from D1645

Push/Pop mismatch caused GL_STACK_UNDERFLOW

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

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

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index e7223dd..4d73e0b 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3316,7 +3316,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 		/* bind */
 		ofs = GPU_offscreen_create(sizex, sizey, full_samples ? 0 : samples, err_out);
 		if (ofs == NULL) {
-			glPopAttrib();
 			return NULL;
 		}
 	}
@@ -3442,8 +3441,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(
 
 	if (own_ofs) {
 		GPU_offscreen_free(ofs);
-
-		glPopAttrib();
 	}
 
 	if (ibuf->rect_float && ibuf->rect)




More information about the Bf-blender-cvs mailing list