[Hgengine-cvs] SF.net SVN: hgengine:[515] Mercury2/src/Texture.cpp

[<axl...@us...>]

Revision: 515
          http://hgengine.svn.sourceforge.net/hgengine/?rev=515&view=rev
Author:   axlecrusher
Date:     2009-08-23 02:11:55 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
i guess all GL api calls can be done together when binding texture

Modified Paths:
--------------
    Mercury2/src/Texture.cpp

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2009-08-23 01:41:14 UTC (rev 514)
+++ Mercury2/src/Texture.cpp	2009-08-23 02:11:55 UTC (rev 515)
@@ -127,10 +127,12 @@
 		Activate();
 		
 		GLCALL( glBindTexture(GL_TEXTURE_2D, m_textureID) );
+		
+		GLCALL( glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) );
+		
 		m_lastBound[m_numActiveTextures] = this;
 		++m_textureBinds;
 	}
-	GLCALL( glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) );
 	
 	GLERRORCHECK;
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.