X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobject.cpp;h=f23f66584880d0bd18a4bf55d9eaf6cc0dba3e7e;hb=551311c6424ce6189283165841a7049d5bba160d;hp=1e94d7ccf96b741c2c0b4c1d3efec60ff86a773f;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 1e94d7cc..f23f6658 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -19,6 +19,12 @@ Object::Object():
 	meshes(1)
 { }
 
+Object::Object(const Mesh *m, const Technique *t)
+{
+	set_mesh(m);
+	set_technique(t);
+}
+
 Object::~Object()
 {
 }
@@ -117,8 +123,6 @@ Object::Loader::Loader(Object &o, Collection &c):
 
 void Object::Loader::init()
 {
-	allow_pointer_reload = false;
-
 	add("mesh",     &Loader::mesh_inline);
 	add("mesh",     &Loader::mesh_inline_lod);
 	add("mesh",     &Loader::mesh);
@@ -152,12 +156,12 @@ void Object::Loader::mesh_inline_lod(unsigned l)
 
 void Object::Loader::mesh(const std::string &n)
 {
-	obj.set_mesh(get_collection().get<Mesh>(n));
+	obj.set_mesh(&get_collection().get<Mesh>(n));
 }
 
 void Object::Loader::mesh_lod(unsigned l, const string &n)
 {
-	obj.set_mesh(l, get_collection().get<Mesh>(n));
+	obj.set_mesh(l, &get_collection().get<Mesh>(n));
 }
 
 void Object::Loader::technique_inline()
@@ -172,7 +176,7 @@ void Object::Loader::technique_inline()
 
 void Object::Loader::technique(const std::string &n)
 {
-	obj.set_technique(get_collection().get<Technique>(n));
+	obj.set_technique(&get_collection().get<Technique>(n));
 }
 
 } // namespace GL