Remove the LIGHTING enum

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

diff --git a/source/lighting.cpp b/source/lighting.cpp
index 44a01a5e6ab6ade990bd324d0ea7a0f97a5c8e85..4cd4858b438fc99ef51a8ffb4702da674b3efd3d 100644 (file)
--- a/source/lighting.cpp
+++ b/source/lighting.cpp
@@ -42,7 +42,7 @@ void Lighting::bind() const
        if(!set_current(this))
                return;
 
-       enable(LIGHTING);
+       enable(GL_LIGHTING);
        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, &ambient.r);
        for(unsigned i=0; i<lights.size(); ++i)
                if(lights[i])
@@ -57,11 +57,9 @@ void Lighting::unbind()
 
        for(unsigned i=0; i<old->lights.size(); ++i)
                if(old->lights[i])
-               {
-                       Light::activate(i);
-                       Light::unbind();
-               }
-       disable(LIGHTING);
+                       Light::unbind_from(i);
+
+       disable(GL_LIGHTING);
 }
 
 } // namespace GL