X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=12448a901fc436ce1059b7a92bc834b57f0d6166;hp=ec5f431ddba048cf441b2024de70fc84737b92f3;hb=6880f2eceaab2cec7882b0791dd982fe9d9c5068;hpb=ef650a483b4201a1e9727f9a86e59894344d30e8

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index ec5f431d..12448a90 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -277,14 +277,17 @@ void Resources::set_debug_name(const string &name, T &item)
 Resources::Loader::Loader(Resources &r):
 	DerivedObjectLoader<Resources, Collection::Loader>(r)
 {
-	add("scene", &Loader::scene);
+	add("light", &Loader::generic<Light>);
+	add("material", &Loader::generic<Material>);
+	add("scene", &Loader::generic<Scene>);
 }
 
-void Resources::Loader::scene(const string &name)
+template<typename T>
+void Resources::Loader::generic(const string &name)
 {
-	Scene::GenericLoader ldr(obj);
+	typename T::GenericLoader ldr(obj);
 	load_sub_with(ldr);
-	obj.add(name, ldr.get_object());
+	ldr.store_object(obj, name);
 }
 
 } // namespace GL