X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fmaterial.h;h=4f8e23ccc972001c892bb6e37a65f9448e3f1c9d;hp=40d2b7ee96193627e148c2e4bf7189513cfbfc01;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hpb=a2b0d155023ca23afe7848ae5d17e0f7bc328525 diff --git a/source/materials/material.h b/source/materials/material.h index 40d2b7ee..4f8e23cc 100644 --- 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();