X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobject.cpp;h=bd899961030095439688bf3bdc866691cfccb088;hb=7398ee7ebbd8b7e56c721a85cbe721b79758d09a;hp=06062fc099da69e169f0f23431c5445ce931216b;hpb=e45ade69a77f7ba91b47bebad604ae29b5705b21;p=libs%2Fgl.git

diff --git a/source/object.cpp b/source/object.cpp
index 06062fc0..bd899961 100644
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -32,7 +32,7 @@ Object::~Object()
 void Object::set_mesh(unsigned i, const Mesh *m)
 {
 	if(i>meshes.size())
-		throw invalid_argument("Object::set_mesh");
+		throw out_of_range("Object::set_mesh");
 
 	if(i==meshes.size())
 		meshes.push_back(m);
@@ -77,7 +77,7 @@ void Object::render(Renderer &renderer, const Tag &tag) const
 		return;
 
 	Renderer::Push push(renderer);
-	renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+	renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
 	renderer.set_material(pass->get_material());
 	renderer.set_texturing(pass->get_texturing());
 
@@ -91,7 +91,7 @@ void Object::render(Renderer &renderer, const ObjectInstance &inst, const Tag &t
 		return;
 
 	Renderer::Push push(renderer);
-	renderer.set_shader(pass->get_shader_program(), pass->get_shader_data());
+	renderer.set_shader_program(pass->get_shader_program(), pass->get_shader_data());
 	renderer.set_material(pass->get_material());
 	renderer.set_texturing(pass->get_texturing());
 
@@ -144,7 +144,7 @@ void Object::Loader::mesh_inline()
 void Object::Loader::mesh_inline_lod(unsigned l)
 {
 	if(l>obj.meshes.size())
-		throw invalid_argument("Object::Loader::mesh_inline_lod");
+		throw out_of_range("Object::Loader::mesh_inline_lod");
 
 	RefPtr<Mesh> msh = new Mesh;
 	load_sub(*msh);