X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturing.cpp;h=1c8410c57a6bff3ee9388805964a1cca0876981c;hb=5a93cc603eef43617a10b76bc9c19a3272ac1d49;hp=880f3f0751a40df642d4b7d713d3497c94476da2;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/texturing.cpp b/source/texturing.cpp
index 880f3f07..1c8410c5 100644
--- a/source/texturing.cpp
+++ b/source/texturing.cpp
@@ -47,22 +47,20 @@ void Texturing::set_attachment(unsigned attch, const Texture *tex, const TexEnv
 void Texturing::bind_attachment(unsigned i) const
 {
 	const Attachment &attch = attachments[i];
-	TexUnit::activate(i);
 	if(attch.tex)
-		attch.tex->bind();
+		attch.tex->bind_to(i);
 	else
-		Texture::unbind();
+		Texture::unbind_from(i);
 	if(attch.env)
-		attch.env->bind();
+		attch.env->bind_to(i);
 	else
-		TexEnv::unbind();
+		TexEnv::unbind_from(i);
 }
 
 void Texturing::unbind_attachment(unsigned i)
 {
-	TexUnit::activate(i);
-	Texture::unbind();
-	TexEnv::unbind();
+	Texture::unbind_from(i);
+	TexEnv::unbind_from(i);
 }
 
 void Texturing::bind() const