[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55434] branches/ge_harmony/source/ gameengine/Rasterizer/RAS_OpenGLRasterizer: Being more specific about a couple of matrix pushes to avoid relying on previous state .

[Daniel Stokes]

Revision: 55434
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55434
Author:   kupoman
Date:     2013-03-20 01:39:05 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Being more specific about a couple of matrix pushes to avoid relying on previous state. This helps protect against problems like stack under flows.

Modified Paths:
--------------
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
    branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp	2013-03-20 01:37:41 UTC (rev 55433)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OGLFilterManager.cpp	2013-03-20 01:39:05 UTC (rev 55434)
@@ -547,8 +547,9 @@
 	// fix for [#34523] alpha buffer is now available for all OSs
 	glDisable(GL_ALPHA_TEST);
 	
-	glPushMatrix();		//GL_MODELVIEW
-	glLoadIdentity();	// GL_MODELVIEW
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	glLoadIdentity();
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 	glMatrixMode(GL_PROJECTION);

Modified: branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2013-03-20 01:37:41 UTC (rev 55433)
+++ branches/ge_harmony/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2013-03-20 01:39:05 UTC (rev 55434)
@@ -658,8 +658,9 @@
 	glPolygonMode(GL_FRONT, GL_FILL);
 	// if the last rendered face had alpha add it would messes with the color of the plane we apply 2DFilter to
 	glDisable(GL_BLEND);
-	glPushMatrix();		//GL_MODELVIEW
-	glLoadIdentity();	// GL_MODELVIEW
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	glLoadIdentity();
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 	glMatrixMode(GL_PROJECTION);