Merge remote-tracking branch 'origin/master'

src/JGL.cpp

@@ -86,7 +86,6 @@ namespace JGL {
 
     void J2D::End() {
         //Change back to the previous projection (The 3D one in Re3D's case.)
-        glDisable(GL_TEXTURE_2D);
         glPopMatrix();
         glMatrixMode(GL_PROJECTION);
         glPopMatrix();
@@ -418,12 +417,10 @@ namespace JGL {
 
         if (!inJ2D)
             inJ3D = true;
-        else { ERROR("Attempt to Begin J3D inside of J2D context.") }
+        else { ERROR("Attempt to Begin J3D inside of J2D context.")}
     }
 
     void J3D::End() {
-        glDisable(GL_TEXTURE_2D);
-
         if (wasDepthTestEnabled)
             glEnable(GL_DEPTH_TEST);
 
@@ -433,7 +430,7 @@ namespace JGL {
         if (wasTexture2DEnabled)
             glDisable(GL_TEXTURE_2D);
 
-        if (wasBlendEnabled)
+        if (!wasBlendEnabled)
             glDisable(GL_BLEND);
 
         if (wasCullFaceEnabled)