From f17351072fc5e04d765b03df825bf136f9557736 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Tue, 5 Aug 2014 21:36:47 -0400
Subject: [PATCH] set active texture in GL, not Font module

---
 src/Font.cc | 1 -
 src/GL.cc   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Font.cc b/src/Font.cc
index 961552d..8567f0d 100644
--- a/src/Font.cc
+++ b/src/Font.cc
@@ -157,7 +157,6 @@ bool Glyph::load(FT_Face face, FT_ULong char_code)
                width);
     }
 
-    glActiveTexture(GL_TEXTURE0);
     m_texture = new GLTexture();
     m_texture->create(width, height);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
diff --git a/src/GL.cc b/src/GL.cc
index 0b261d9..289aa5a 100644
--- a/src/GL.cc
+++ b/src/GL.cc
@@ -107,6 +107,7 @@ void GL_Load()
     }
 
     glEnable(GL_SCISSOR_TEST);
+    glActiveTexture(GL_TEXTURE0);
 
     loaded = true;
 }