X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fscene.cpp;h=b8cdc04516191226b76fd9a89f16b65721106b70;hp=dd611536bf605ab8b53708e60831ba342560e54b;hb=a3a59b5ff2364ad657de1f385c99546c32b2bfb4;hpb=6cbabebe65575a55e120acd6294da305765d5bbb

diff --git a/source/render/scene.cpp b/source/render/scene.cpp
index dd611536..b8cdc045 100644
--- a/source/render/scene.cpp
+++ b/source/render/scene.cpp
@@ -1,6 +1,6 @@
 #include <msp/datafile/collection.h>
-#include "animatedobject.h"
 #include "camera.h"
+#include "objectinstance.h"
 #include "orderedscene.h"
 #include "renderer.h"
 #include "scene.h"
@@ -120,12 +120,12 @@ void Scene::Loader::object(const string &n)
 
 void Scene::Loader::object_tagged(const string &n, const string &t)
 {
-	RefPtr<AnimatedObject> anob = new AnimatedObject(get_collection().get<GL::Object>(n));
-	load_sub(*anob);
-	obj.add(*anob);
+	RefPtr<ObjectInstance> inst = new ObjectInstance(get_collection().get<GL::Object>(n));
+	load_sub(*inst);
+	obj.add(*inst);
 	if(content && !t.empty())
-		(*content)[t] = anob.get();
-	obj.owned_data.push_back(anob.release());
+		(*content)[t] = inst.get();
+	obj.owned_data.push_back(inst.release());
 }