]> git.tdb.fi Git - r2c2.git/commitdiff
Pass catalogue reference to Object and Technique loaders
authorMikko Rasa <tdb@tdb.fi>
Sun, 24 Nov 2013 21:43:13 +0000 (23:43 +0200)
committerMikko Rasa <tdb@tdb.fi>
Sun, 24 Nov 2013 21:43:13 +0000 (23:43 +0200)
source/3d/catalogue.cpp

index e28237f9fb37e27ec2b326ff6fe7b2f492b4d2ca..c02b7e6fddbc3ca64f860333d8fa06047187be51 100644 (file)
@@ -19,9 +19,9 @@ Catalogue3D::Catalogue3D(Catalogue &c):
 {
        add_type<GL::Material>().creator(&Catalogue3D::create<GL::Material>);
        add_type<GL::Mesh>().creator(&Catalogue3D::create<GL::Mesh>);
-       add_type<GL::Object>().creator(&Catalogue3D::create<GL::Object>);
+       add_type<GL::Object>().creator(&Catalogue3D::create2<GL::Object>);
        add_type<GL::Program>().creator(&Catalogue3D::create<GL::Program>);
-       add_type<GL::Technique>().creator(&Catalogue3D::create<GL::Technique>);
+       add_type<GL::Technique>().creator(&Catalogue3D::create2<GL::Technique>);
 
        catalogue.signal_object_added.connect(sigc::mem_fun(this, &Catalogue3D::object_added));