X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Finstancearray.cpp;h=5854906fe9229de3a59e46f13f27e8f3521c2d20;hb=d40673bd28c4b4524d3642b949d9d109dc6f9f24;hp=4287700f0eeb768c4bbaf145fb3e463350a14786;hpb=233dff2a6c552e08da832496aecd88ef4f8948f1;p=libs%2Fgl.git

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 4287700f..5854906f 100644
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -52,9 +52,10 @@ InstanceArray::InstanceArray(const Object &o):
 		instance_data->use_buffer(instance_buffer);
 
 		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_instance_array(instance_data);
+		vtx_setup->set_instance_array(*instance_data);
 	}
 	else
 		static Require req(ARB_vertex_shader);
@@ -62,7 +63,7 @@ InstanceArray::InstanceArray(const Object &o):
 
 InstanceArray::~InstanceArray()
 {
-	for(std::vector<ObjectInstance *>::iterator i=instances.begin(); i!=instances.end(); ++i)
+	for(vector<ObjectInstance *>::iterator i=instances.begin(); i!=instances.end(); ++i)
 		delete *i;
 	delete vtx_setup;
 	delete instance_data;