Only allow VertexArray's format to be set once

[libs/gl.git] / source / render / instancearray.cpp

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 231bebe1beaabe28df632d9dc0ce1f1b58db0109..5854906fe9229de3a59e46f13f27e8f3521c2d20 100644 (file)
--- 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);