From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 24 Nov 2013 21:43:13 +0000 (+0200)
Subject: Pass catalogue reference to Object and Technique loaders
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ca18ff7808e12fba5722e6b79e00e9d41d38966e;p=r2c2.git

Pass catalogue reference to Object and Technique loaders
---

diff --git a/source/3d/catalogue.cpp b/source/3d/catalogue.cpp
index e28237f..c02b7e6 100644
--- a/source/3d/catalogue.cpp
+++ b/source/3d/catalogue.cpp
@@ -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));