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

diff --git a/source/render/object.h b/source/render/object.h
index ca41ffac..ac62c702 100644
--- a/source/render/object.h
+++ b/source/render/object.h
@@ -9,11 +9,9 @@
 namespace Msp {
 namespace GL {
 
-class Material;
 class Mesh;
 class ObjectInstance;
 class Technique;
-class Texture;
 
 /**
 Combines a Mesh with a Technique to give it an appearance.  The Technique will
@@ -52,10 +50,10 @@ public:
 	class Loader: public LodLoader
 	{
 	public:
-		Loader(Object &);
-		Loader(Object &, Collection &);
+		Loader(Object &o): Loader(o, 0) { }
+		Loader(Object &o, Collection &c): Loader(o, &c) { }
 	private:
-		void init();
+		Loader(Object &, Collection *);
 		virtual void finish();
 
 		void bounding_sphere_hint(float, float, float, float);