X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;fp=source%2Frender%2Fscene.cpp;h=229588679af54726cb3a203ed3d8b21a1e4330c9;hb=f19366d32cc29287a2730cfba90893e407754081;hp=87d8c423852ac749ec29a45e9af7331c5f214031;hpb=f96d553dbf78f9d664d1dbb1fe002fc43f23ad47;p=libs%2Fgl.git

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index 87d8c423..22958867 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -89,24 +89,11 @@ Scene::SceneRegistry &Scene::get_scene_registry()
 }
 
 
-Scene::Loader::Loader(Scene &s, Collection &c):
+Scene::Loader::Loader(Scene &s, Collection &c, ContentMap *m):
 	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(0)
+	content(m),
+	inst_counter(0)
 {
-	init();
-}
-
-Scene::Loader::Loader(Scene &s, Collection &c, ContentMap &m):
-	DataFile::CollectionObjectLoader<Scene>(s, &c),
-	content(&m)
-{
-	init();
-}
-
-void Scene::Loader::init()
-{
-	inst_counter = 0;
-
 	add("object", &Loader::object);
 	add("object", &Loader::object_tagged);
 	add("scene", &Loader::scene);