X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Frendermethod.cpp;h=053197589ab1fe6e9d3c83c78261ffc3e27ebc0e;hb=5a01404e40717c6c2cc389ed8357713e1f216f07;hp=2c36cd6fa1e132e9eeded8a3066320cac582a0b9;hpb=23d4100160bfa33359ce297b6b36244abcaa5f82;p=libs%2Fgl.git diff --git a/source/materials/rendermethod.cpp b/source/materials/rendermethod.cpp index 2c36cd6f..05319758 100644 --- a/source/materials/rendermethod.cpp +++ b/source/materials/rendermethod.cpp @@ -124,12 +124,6 @@ void RenderMethod::set_debug_name(const string &name) DataFile::Loader::ActionMap RenderMethod::Loader::shared_actions; -RenderMethod::Loader::Loader(RenderMethod &p): - DataFile::CollectionObjectLoader(p, 0) -{ - set_actions(shared_actions); -} - RenderMethod::Loader::Loader(RenderMethod &p, Collection &c): DataFile::CollectionObjectLoader(p, &c) { @@ -166,9 +160,7 @@ void RenderMethod::Loader::material_inline() { Material::GenericLoader ldr(get_collection()); load_sub_with(ldr); - RefPtr mat = ldr.get_object(); - get_collection().add(inline_base_name+".mat", mat.get()); - obj.material = mat.release(); + obj.material = ldr.store_object(get_collection(), inline_base_name+".mat"); obj.set_material_textures(); }