X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobject.cpp;h=5aec7e744a3ce308c8b818edb76c8ce4a8a39abd;hp=1e94d7ccf96b741c2c0b4c1d3efec60ff86a773f;hb=0fc02952ed449ff85f5f9e96ea2fc724c8456891;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f diff --git a/source/object.cpp b/source/object.cpp index 1e94d7cc..5aec7e74 100644 --- a/source/object.cpp +++ b/source/object.cpp @@ -117,8 +117,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 +150,12 @@ void Object::Loader::mesh_inline_lod(unsigned l) void Object::Loader::mesh(const std::string &n) { - obj.set_mesh(get_collection().get(n)); + obj.set_mesh(&get_collection().get(n)); } void Object::Loader::mesh_lod(unsigned l, const string &n) { - obj.set_mesh(l, get_collection().get(n)); + obj.set_mesh(l, &get_collection().get(n)); } void Object::Loader::technique_inline() @@ -172,7 +170,7 @@ void Object::Loader::technique_inline() void Object::Loader::technique(const std::string &n) { - obj.set_technique(get_collection().get(n)); + obj.set_technique(&get_collection().get(n)); } } // namespace GL