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

# Conflicts:
#	bin/SDL2.dll
#	bin/cembed.exe
#	bin/jin.exe
#	bin/lua51.dll

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libjin/graphics/shaders/shader.cpp b/src/libjin/graphics/shaders/shader.cpp
index dce795d..36f6603 100644
--- a/src/libjin/graphics/shaders/shader.cpp
+++ b/src/libjin/graphics/shaders/shader.cpp
@@ -218,8 +218,8 @@ namespace JinEngine
                     return *this;
                 }
                 gl.activeTextureUnit(unit);
-                glUniform1i(location, unit);
                 gl.bindTexture2D(tex->getGLTexture());
+                glUniform1i(location, unit);
                 gl.activeTextureUnit(MAIN_TEXTURE_UNIT);
                 return *this;
             }
@@ -236,9 +236,9 @@ namespace JinEngine
                     // TODO: �쳣�������󶨵����������������
                     return *this;
                 }
-                glUniform1i(location, unit);
                 glActiveTexture(GL_TEXTURE0 + unit);
                 gl.bindTexture2D(canvas->getGLTexture());
+                glUniform1i(location, unit);
 
                 glActiveTexture(GL_TEXTURE0);
                 return *this;