X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=d4562b86103af8abd34a8dbdcf3c2cf46dd8221e;hb=cf17331b8ddc0e00c3ba452e0f4dfa183dc8e019;hp=1852f91b50222ead401dfa177605c31d9d1ee21b;hpb=af0ba2af0167247bcda74e76f3c83c0c0e89650a;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 1852f91b..d4562b86 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -38,7 +38,7 @@ Object::~Object()
 {
 	if(lods[0].mesh && lod0_watched)
 		if(ResourceManager *rm = lods[0].mesh->get_manager())
-			rm->unwatch_resource(*lods[0].mesh, *this);
+			rm->unobserve_resource(*lods[0].mesh, *this);
 }
 
 Object::LevelOfDetail &Object::get_lod(unsigned i, const char *caller)
@@ -59,7 +59,7 @@ void Object::set_mesh(unsigned i, const Mesh *m)
 	RefPtr<const Mesh> &ptr = get_lod(i, "Object::set_mesh").mesh;
 	if(i==0 && ptr && lod0_watched)
 		if(ResourceManager *rm = ptr->get_manager())
-			rm->unwatch_resource(*ptr, *this);
+			rm->unobserve_resource(*ptr, *this);
 	ptr = m;
 	ptr.keep();
 	lod0_watched = false;
@@ -67,7 +67,7 @@ void Object::set_mesh(unsigned i, const Mesh *m)
 	if(i==0 && m)
 		if(ResourceManager *rm = m->get_manager())
 		{
-			rm->watch_resource(*m, *this);
+			rm->observe_resource(*m, *this);
 			lod0_watched = true;
 		}
 
@@ -170,9 +170,7 @@ const RenderPass *Object::get_pass(const Tag &tag, unsigned lod) const
 	const Technique *tech = lods[lod].technique.get();
 	if(!tech)
 		throw logic_error("no technique");
-	if(!tech->has_pass(tag))
-		return 0;
-	return &tech->get_pass(tag);
+	return tech->find_pass(tag);
 }
 
 void Object::resource_loaded(Resource &res)