Rework Bind and enable it to restore the old binding

[libs/gl.git] / source / material.h

diff --git a/source/material.h b/source/material.h
index 6614aeeae12cac4c51b0e9b91c320106b256eea1..fa1612e142d1dca596fe58a59e03491d74b0fc70 100644 (file)
--- a/source/material.h
+++ b/source/material.h
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_MATERIAL_H_
 
 #include <msp/datafile/objectloader.h>
+#include "bindable.h"
 #include "color.h"
 
 namespace Msp {
@@ -18,7 +19,7 @@ namespace GL {
 Stores OpenGL material properties.  Since OpenGL does not support material
 objects, application of material is done with several calls to glMaterial.
 */
-class Material
+class Material: public Bindable<Material>
 {
 public:
        class Loader: public DataFile::ObjectLoader<Material>
@@ -55,8 +56,6 @@ public:
        void bind() const;
 
        static void unbind();
-private:
-       static const Material *current;
 };
 
 } // namespace GL