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

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

Revision: 450
          http://hgengine.svn.sourceforge.net/hgengine/?rev=450&view=rev
Author:   axlecrusher
Date:     2009-08-01 17:48:06 +0000 (Sat, 01 Aug 2009)

Log Message:
-----------
fix texture binding to shader

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

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2009-08-01 14:20:20 UTC (rev 449)
+++ Mercury2/src/Texture.cpp	2009-08-01 17:48:06 UTC (rev 450)
@@ -120,7 +120,7 @@
 	
 	ShaderAttribute sa;
 	sa.type = ShaderAttribute::TYPE_SAMPLER;
-	sa.value.iSampler = m_textureResource;
+	sa.value.iSampler = m_numActiveTextures;
 	Shader::SetAttribute( ssprintf("HG_Texture%d", m_numActiveTextures), sa);
 
 	m_activeTextures.push_back(this);


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