X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=dc1f4f3f1a7996bd55008732df21c0c826f27af5;hb=b13f1bced27e0ad3e4661e645f6bafed38359120;hp=25daf13ec5dd02fba0bdc17ed9fa6511ab360ebd;hpb=df20a7e137542a4156cc5ffa8118d59de6b68547;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 25daf13e..dc1f4f3f 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -140,11 +140,15 @@ void Object::render(Renderer &renderer, const Tag &tag) const
 	if(!pass)
 		return;
 
+	const Mesh *mesh = lods.front().mesh.get();
+	if (!mesh)
+		throw logic_error("no mesh");
+
 	Renderer::Push push(renderer);
 	pass->apply(renderer);
 
 	setup_render(renderer, tag);
-	lods.front().mesh->draw(renderer);
+	mesh->draw(renderer);
 	finish_render(renderer, tag);
 }
 
@@ -155,12 +159,16 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
 	if(!pass)
 		return;
 
+	const Mesh *mesh = lods[lod].mesh.get();
+	if (!mesh)
+		throw logic_error("no mesh");
+
 	Renderer::Push push(renderer);
 	pass->apply(renderer);
 
 	setup_render(renderer, tag);
 	inst.setup_render(renderer, tag);
-	lods[lod].mesh->draw(renderer);
+	mesh->draw(renderer);
 	inst.finish_render(renderer, tag);
 	finish_render(renderer, tag);
 }
@@ -170,9 +178,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)