Unify the loader wrappers for Material and Scene

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

diff --git a/source/materials/material.h b/source/materials/material.h
index 40d2b7ee96193627e148c2e4bf7189513cfbfc01..4f8e23ccc972001c892bb6e37a65f9448e3f1c9d 100644 (file)
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -74,10 +74,11 @@ public:
                static ActionMap shared_actions;
 
        public:
-               GenericLoader(DataFile::Collection * = 0);
+               GenericLoader();
+               GenericLoader(DataFile::Collection &);
                ~GenericLoader();
 
-               Material *get_material() { Material *m = material; material = 0; return m; }
+               Material *get_object() { Material *m = material; material = 0; return m; }
        private:
                virtual void init_actions();