[Bf-blender-cvs] [878938f] blender2.8: OpenGL: remove some unused legacy matrix calls

Mike Erwin noreply at git.blender.org
Sun Oct 16 08:09:42 CEST 2016


Commit: 878938f203b4a404ad238d63ff1636a6c6067d72
Author: Mike Erwin
Date:   Sat Oct 15 19:08:19 2016 -0400
Branches: blender2.8
https://developer.blender.org/rB878938f203b4a404ad238d63ff1636a6c6067d72

OpenGL: remove some unused legacy matrix calls

Part of T49450

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

M	source/blender/editors/interface/view2d.c

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

diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index c78d97e..482b764 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -1100,9 +1100,6 @@ void UI_view2d_view_ortho(View2D *v2d)
 	
 	/* set matrix on all appropriate axes */
 	wmOrtho2(curmasked.xmin, curmasked.xmax, curmasked.ymin, curmasked.ymax);
-
-	/* XXX is this necessary? */
-	glLoadIdentity();
 }
 
 /**
@@ -1130,9 +1127,6 @@ void UI_view2d_view_orthoSpecial(ARegion *ar, View2D *v2d, const bool xaxis)
 		wmOrtho2(curmasked.xmin - xofs, curmasked.xmax - xofs, -yofs, ar->winy - yofs);
 	else
 		wmOrtho2(-xofs, ar->winx - xofs, curmasked.ymin - yofs, curmasked.ymax - yofs);
-		
-	/* XXX is this necessary? */
-	glLoadIdentity();
 } 
 
 
@@ -2424,11 +2418,6 @@ void UI_view2d_text_cache_draw(ARegion *ar)
 		BLI_memarena_free(g_v2d_strings_arena);
 		g_v2d_strings_arena = NULL;
 	}
-
-	// glMatrixMode(GL_PROJECTION);
-	// glPopMatrix();
-	// glMatrixMode(GL_MODELVIEW);
-	// glPopMatrix();
 }




More information about the Bf-blender-cvs mailing list