X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobject.cpp;h=db2866115a05561500843a7c7b0c7540b3be328c;hp=78f445577caa54209044e3db4dc40dd1e33b5cec;hb=50e504e2171295d5922ddf87b358e0024db3ce40;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77

diff --git a/source/object.cpp b/source/object.cpp
index 78f44557..db286611 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -78,7 +78,7 @@ void Object::setup_render(const ObjectPass &pass) const
 		main_texture->bind();
 
 	if(material)
-		material->apply();
+		material->bind();
 }
 
 void Object::finish_render(const ObjectPass &pass) const
@@ -94,6 +94,9 @@ void Object::finish_render(const ObjectPass &pass) const
 	}
 	else if(main_texture)
 		Texture::unbind();
+
+	if(material)
+		Material::unbind();
 }
 
 void Object::render(const ObjectPass &pass, const ObjectInstance *inst) const