X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fobject.cpp;h=9a9f759ccf4b53a2c255617b01ade7e12cbc0b42;hp=b63434742b7ef8a7305a2bbcaed7e3e85a9ba98b;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=c0b7d6ee4a7478f5aecb1504429ec1fc846d64ed

diff --git a/source/render/object.cpp b/source/render/object.cpp
index b6343474..9a9f759c 100644
--- a/source/render/object.cpp
+++ b/source/render/object.cpp
@@ -17,13 +17,11 @@ namespace GL {
 const Matrix Object::identity_matrix;
 
 Object::Object():
-	lods(1),
-	lod0_watched(false)
+	lods(1)
 { }
 
 Object::Object(const Mesh *m, const Technique *t):
-	lods(1),
-	lod0_watched(false)
+	Object()
 {
 	set_mesh(m);
 	set_technique(t);
@@ -188,7 +186,7 @@ void Object::resource_removed(Resource &res)
 }
 
 
-Object::Loader::Loader(Object &o, Collection *c):
+Object::Loader::Loader(Object &o, Collection &c):
 	LodLoader(o, 0, c)
 {
 	add("bounding_sphere_hint", &Loader::bounding_sphere_hint);
@@ -207,13 +205,13 @@ void Object::Loader::bounding_sphere_hint(float x, float y, float z, float r)
 
 void Object::Loader::level_of_detail(unsigned i)
 {
-	LodLoader ldr(obj, i, coll);
+	LodLoader ldr(obj, i, get_collection());
 	load_sub_with(ldr);
 }
 
 
-Object::LodLoader::LodLoader(Object &o, unsigned i, Collection *c):
-	DataFile::CollectionObjectLoader<Object>(o, c),
+Object::LodLoader::LodLoader(Object &o, unsigned i, Collection &c):
+	DataFile::CollectionObjectLoader<Object>(o, &c),
 	index(i),
 	lod(obj.get_lod(index, "Object::LodLoader::LodLoader"))
 {