Make the use of DevIL optional

[libs/gl.git] / source / texunit.cpp

diff --git a/source/texunit.cpp b/source/texunit.cpp
index bda7599143a11bf05abcf330a58eca6895c3da67..ba3e7ca6208e3716029027dcdb253b7203221f15 100644 (file)
--- a/source/texunit.cpp
+++ b/source/texunit.cpp
@@ -18,7 +18,6 @@ namespace GL {
 TexUnit::TexUnit():
        texture(0)
 {
-       require_version(1, 3);
 }
 
 bool TexUnit::set_texture(const Texture *tex)
@@ -33,7 +32,11 @@ TexUnit &TexUnit::activate(unsigned n)
        if(units.size()<=n)
                units.resize(n+1);
 
-       glActiveTexture(GL_TEXTURE0+n);
+       if(cur_unit!=&units[n] && (cur_unit || n))
+       {
+               require_version(1, 3);
+               glActiveTexture(GL_TEXTURE0+n);
+       }
        cur_unit=&units[n];
 
        return units[n];