X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexunit.cpp;h=ba3e7ca6208e3716029027dcdb253b7203221f15;hb=d1800d7ea80290f4913d0203241cef1409656522;hp=bda7599143a11bf05abcf330a58eca6895c3da67;hpb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;p=libs%2Fgl.git

diff --git a/source/texunit.cpp b/source/texunit.cpp
index bda75991..ba3e7ca6 100644
--- 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];