X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobject.h;h=c8e372601077c1b1e9c43dd82a221b53b1a904a7;hp=3d0415c66daa64b3c8ebb3436b0da037897912e9;hb=698e78ecfa30cc3580050996bc236c3ebe65aa2a;hpb=7da609f539040d11cccc61b838f4b74e06135552

diff --git a/source/object.h b/source/object.h
index 3d0415c6..c8e37260 100644
--- a/source/object.h
+++ b/source/object.h
@@ -5,7 +5,7 @@
 #include "bindable.h"
 #include "renderable.h"
 #include "renderpass.h"
-#include "resourcewatcher.h"
+#include "resourceobserver.h"
 
 namespace Msp {
 namespace GL {
@@ -28,7 +28,7 @@ Objects can have multiple levels of detail.  The most detailed level has index
 0, with increasing indices having less detail.  When rendering an instance, the
 instance's get_level_of_detail method is called to determine which LoD to use.
 */
-class Object: public Renderable, private ResourceWatcher
+class Object: public Renderable, private ResourceObserver
 {
 private:
 	struct LevelOfDetail;
@@ -107,8 +107,6 @@ public:
 
 	virtual const Geometry::BoundingSphere<float, 3> *get_bounding_sphere() const { return &bounding_sphere; }
 
-	virtual void render(const Tag &tag = Tag()) const;
-
 	virtual void render(Renderer &, const Tag & = Tag()) const;
 
 	/** Renders an instance of the object.  The instance's hook functions are