Fix loading of inline materials and lights

diff --git a/source/materials/lighting.cpp b/source/materials/lighting.cpp
index 3057d20d77baaccd1e00804ad37521868ff5c342..f6bb39ffce98ecd701b901c223bf1244e415a9ae 100644 (file)
--- a/source/materials/lighting.cpp
+++ b/source/materials/lighting.cpp
@@ -144,9 +144,8 @@ void Lighting::Loader::light_inline()
 {
        Light::GenericLoader ldr(get_collection());
        load_sub_with(ldr);
-       RefPtr<Light> lgt = ldr.get_object();
-       get_collection().add(format("%s/%d.light", FS::basename(get_source()), obj.lights.size()), lgt.get());
-       obj.attach(*lgt.release());
+       Light *lgt = ldr.store_object(get_collection(), format("%s/%d.light", FS::basename(get_source()), obj.lights.size()));
+       obj.attach(*lgt);
 }
 
 } // namespace GL

diff --git a/source/materials/rendermethod.cpp b/source/materials/rendermethod.cpp
index 35c24c1f080cb3e23fc9908d0d11fcc98852900e..053197589ab1fe6e9d3c83c78261ffc3e27ebc0e 100644 (file)
--- a/source/materials/rendermethod.cpp
+++ b/source/materials/rendermethod.cpp
@@ -160,9 +160,7 @@ void RenderMethod::Loader::material_inline()
 {
        Material::GenericLoader ldr(get_collection());
        load_sub_with(ldr);
-       RefPtr<Material> 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();
 }