[Hgengine-cvs] SF.net SVN: hgengine:[356] Mercury2/src

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

Revision: 356
          http://hgengine.svn.sourceforge.net/hgengine/?rev=356&view=rev
Author:   axlecrusher
Date:     2009-06-21 13:06:46 +0000 (Sun, 21 Jun 2009)

Log Message:
-----------
unneeded

Modified Paths:
--------------
    Mercury2/src/Shader.cpp
    Mercury2/src/Shader.h

Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp	2009-06-21 02:57:59 UTC (rev 355)
+++ Mercury2/src/Shader.cpp	2009-06-21 13:06:46 UTC (rev 356)
@@ -11,8 +11,7 @@
 
 REGISTER_ASSET_TYPE( Shader );
 
-ShaderAttributesSet SHADERATTRIBUTES;
-Shader * Shader::CurrentShader;
+Shader * Shader::CurrentShader = NULL;
 
 ShaderAttribute * ShaderAttributesSet::GetHandle( const MString & sName )
 {

Modified: Mercury2/src/Shader.h
===================================================================
--- Mercury2/src/Shader.h	2009-06-21 02:57:59 UTC (rev 355)
+++ Mercury2/src/Shader.h	2009-06-21 13:06:46 UTC (rev 356)
@@ -50,8 +50,6 @@
 	std::map< MString, ShaderAttribute * > m_AllShaderAttributes;
 };
 
-extern ShaderAttributesSet SHADERATTRIBUTES;
-
 ///Basic element for turning shaders on and off
 /** This class helps aide in the loading and use of shaders.  It allows loading of files
     through the LoadShader() function that actively looks for .frag and .vert files.  By use
@@ -161,7 +159,7 @@
 	float fPriority;
 
 	///Global static shader (so shaders can recursively activate and deactivate shaders)
-	static Shader * CurrentShader;
+	static Shader* CurrentShader;
 
 	///Original Shader (to re-enable when leaving)
 	Shader * OriginalShader;


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