Merge branch 'master' of warmcat.org:/home/git-repo/Jin

1 files changed, 7 insertions, 2 deletions

diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h
index c3ca721..402805a 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/je_shader.h
@@ -47,7 +47,12 @@ namespace JinEngine
                 ///
                 /// Prepare shader and set default uniforms.
                 ///
-                Shader& prepare();
+                Shader& begin();
+
+                ///
+                /// End use shader.
+                ///
+                void end();
 
                 /// 
                 /// Send float value to shader.
@@ -181,7 +186,7 @@ namespace JinEngine
                 /// 
                 bool compile(const std::string& program);
 
-                static GLint mTextureUnit;
+                //static GLint mTextureUnit;
                 static GLint mAttributeIndex;
 
                 GLuint mPID;