Object model for Material and TexEnv

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

diff --git a/source/object.cpp b/source/object.cpp
index 78f445577caa54209044e3db4dc40dd1e33b5cec..db2866115a05561500843a7c7b0c7540b3be328c 100644 (file)
--- 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