6 files changed, 9 insertions, 10 deletions
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/je_texture_font.cpp
index 52d9603..542fe7d 100644
--- a/src/libjin/graphics/fonts/je_texture_font.cpp
+++ b/src/libjin/graphics/fonts/je_texture_font.cpp
@@ -286,7 +286,6 @@ namespace JinEngine
                         .uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
                     gl.bindTexture2D(info.texture);
                     gl.drawArrays(GL_QUADS, 0, info.count);
-                    gl.bindTexture2D(0);
                 }
                 shader->end();
             }
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/je_ttf.cpp
index 7c40e7b..d145395 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/je_ttf.cpp
@@ -206,11 +206,11 @@ namespace JinEngine
                 if (glGetError() != GL_NO_ERROR)
                 {
                     glDeleteTextures(1, &t);
-                    gl.bindTexture2D(0);
+                    
                     return 0;
                 }
                 atlases.push_back(t);
-                gl.bindTexture2D(0);
+                
                 return t;
             }
 
@@ -305,7 +305,7 @@ namespace JinEngine
                         .uploadUV(2, GL_FLOAT, sizeof(GlyphVertex), &glyphvertices[info.start].u);
                     gl.bindTexture2D(info.texture);
                     gl.drawArrays(GL_QUADS, 0, info.count);
-                    gl.bindTexture2D(0);
+                    
                 }
                 shader->end();
             }
diff --git a/src/libjin/graphics/je_canvas.cpp b/src/libjin/graphics/je_canvas.cpp
index 9437e9a..bb1e2a9 100644
--- a/src/libjin/graphics/je_canvas.cpp
+++ b/src/libjin/graphics/je_canvas.cpp
@@ -32,7 +32,7 @@ namespace JinEngine
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             gl.texImage(GL_RGBA8, w, h, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-            gl.bindTexture2D(0);
+            
             glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
             GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp
index ed9d458..8340741 100644
--- a/src/libjin/graphics/je_graphic.cpp
+++ b/src/libjin/graphics/je_graphic.cpp
@@ -37,7 +37,7 @@ namespace JinEngine
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
             gl.texImage(GL_RGBA8, mSize.w(), mSize.h(), GL_RGBA, GL_UNSIGNED_BYTE, pixels);
-            gl.bindTexture2D(0);
+            
         }
 
         Graphic::~Graphic()
@@ -50,7 +50,7 @@ namespace JinEngine
             gl.bindTexture2D(mTexture);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, max_filter);
-            gl.bindTexture2D(0);
+            
         }
 
         void Graphic::render(float x, float y, float sx, float sy, float r, float ox, float oy) const
@@ -79,7 +79,6 @@ namespace JinEngine
 
             gl.bindTexture2D(getGLTexture());
             gl.drawArrays(GL_QUADS, 0, 4);
-            gl.bindTexture2D(0);
 
             shader->end();
         }
@@ -115,7 +114,6 @@ namespace JinEngine
 
             gl.bindTexture2D(getGLTexture());
             gl.drawArrays(GL_QUADS, 0, 4);
-            gl.bindTexture2D(0);
 
             shader->end();
         }
diff --git a/src/libjin/graphics/je_mesh.cpp b/src/libjin/graphics/je_mesh.cpp
index 08cbfa8..dc67f1e 100644
--- a/src/libjin/graphics/je_mesh.cpp
+++ b/src/libjin/graphics/je_mesh.cpp
@@ -69,7 +69,7 @@ namespace JinEngine
 
             gl.bindTexture2D(mGraphic->getGLTexture());
             gl.drawArrays(GL_POLYGON, 0, mVertices.size());
-            gl.bindTexture2D(0);
+            
 
             shader->end();
         };
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp
index 8ebca8c..3df5a86 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/je_shader.cpp
@@ -97,6 +97,8 @@ namespace JinEngine
                     sendVec2(SHADER_RENDERTARGET_SIZE, rt->getWidth(), rt->getHeight());
                 }
 
+                gl.activeTextureUnit(MAIN_TEXTURE_UNIT);
+
                 return *this;
             }