X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=34eebec782472880484179df7cf2175303086bab;hb=f19366d32cc29287a2730cfba90893e407754081;hp=479e77afa986ac124137a4726717d055af56910a;hpb=b7ecc29c204faede028556d1942b2d61d5cda9ee;p=libs%2Fgl.git

diff --git a/source/render/object.cpp b/source/render/object.cpp
index 479e77af..34eebec7 100644
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -2,12 +2,9 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include "error.h"
-#include "material.h"
 #include "mesh.h"
 #include "object.h"
 #include "objectinstance.h"
-#include "program.h"
-#include "programdata.h"
 #include "renderer.h"
 #include "resourcemanager.h"
 #include "technique.h"
@@ -191,19 +188,8 @@ void Object::resource_removed(Resource &res)
 }
 
 
-Object::Loader::Loader(Object &o):
-	LodLoader(o, 0, 0)
-{
-	init();
-}
-
-Object::Loader::Loader(Object &o, Collection &c):
-	LodLoader(o, 0, &c)
-{
-	init();
-}
-
-void Object::Loader::init()
+Object::Loader::Loader(Object &o, Collection *c):
+	LodLoader(o, 0, c)
 {
 	add("bounding_sphere_hint", &Loader::bounding_sphere_hint);
 	add("level_of_detail", &Loader::level_of_detail);