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

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

Revision: 522
          http://hgengine.svn.sourceforge.net/hgengine/?rev=522&view=rev
Author:   axlecrusher
Date:     2009-08-23 13:10:21 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
fix order of UnbindTexture

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

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2009-08-23 13:08:11 UTC (rev 521)
+++ Mercury2/src/Texture.cpp	2009-08-23 13:10:21 UTC (rev 522)
@@ -150,12 +150,13 @@
 
 void Texture::UnbindTexture()
 {
-//	Deactivate(m_textureResource);
+//Everything needs to be done in reverse of BindTexture()
+	--m_numActiveTextures;
 	
 	Shader::RemoveAttribute( ssprintf("HG_Texture%d", m_numActiveTextures) );
 	m_activeTextures.pop_back();
-	
-	--m_numActiveTextures;
+
+//	Deactivate(GL_TEXTURE0 + m_numActiveTextures);
 }
 
 void Texture::Activate(uint32_t textureResource)


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