X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Finstancearray.cpp;h=039a50ecde32a7500850ca107f040169fe0b5692;hp=11279f76262fe60882df087e91d50d84d43a173b;hb=73567be7cd9e01e620cb2a8fa0ca381723b9a71f;hpb=6955c16bb123f3b795186c99442dc4d92be0ebc9

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 11279f76..039a50ec 100644
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -51,10 +51,12 @@ InstanceArray::InstanceArray(const Object &o):
 		instance_buffer = new Buffer;
 		instance_data->use_buffer(instance_buffer);
 
+		const Mesh *mesh = object.get_mesh();
+
 		vtx_setup = new VertexSetup;
-		vtx_setup->set_format_instanced(object.get_mesh()->get_vertices().get_format(), fmt);
-		vtx_setup->set_vertex_array(object.get_mesh()->get_vertices());
-		vtx_setup->set_index_buffer(*object.get_mesh()->get_index_buffer());
+		vtx_setup->set_format_instanced(mesh->get_vertices().get_format(), fmt);
+		vtx_setup->set_vertex_array(mesh->get_vertices());
+		vtx_setup->set_index_buffer(*mesh->get_index_buffer(), mesh->get_batches().front().get_index_type());
 		vtx_setup->set_instance_array(*instance_data);
 	}
 	else