X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=81373c97b8793bb99f66c5669e6bc7f761c5d7d9;hp=187c2533acbea6fc9e30c33370ffb99ca2a15a18;hb=e1672476c5a258ff67fe1fcb47dd9a40b89169cb;hpb=c8f98daaaba04ba93d6d7170302d8b91c3410fa5

diff --git a/source/texture.cpp b/source/texture.cpp
index 187c2533..81373c97 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -199,17 +199,20 @@ void Texture::bind_to(unsigned i) const
 	}
 
 	TexUnit &unit = TexUnit::get_unit(i);
-	const Texture *cur = unit.get_texture();
+	const Texture *old = unit.get_texture();
 	if(unit.set_texture(this))
 	{
 		if(manager)
 			manager->resource_used(*this);
 
 		unit.bind();
-		if(cur && cur->target!=target)
-			glDisable(cur->target);
-		if(!cur || cur->target!=target)
-			glEnable(target);
+		if(unit.supports_legacy())
+		{
+			if(old && old->target!=target)
+				glDisable(old->target);
+			if(!old || old->target!=target)
+				glEnable(target);
+		}
 		glBindTexture(target, id);
 
 		if(dirty_params)
@@ -233,7 +236,8 @@ void Texture::unbind_from(unsigned i)
 	{
 		unit.bind();
 		glBindTexture(cur->target, 0);
-		glDisable(cur->target);
+		if(unit.supports_legacy())
+			glDisable(cur->target);
 	}
 }