Use is_ortographic in Camera instead of checking fov directly

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

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index 93985578ef08e04a0aaff4b9a66b2d567a5c8634..a03fbf20dff9ca2766c15067087389e0d2902fd3 100644 (file)
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -85,7 +85,7 @@ void InstanceArray::update_instance_matrix(unsigned index)
 {
        const Matrix &m = *instances[index]->get_matrix();
 
-       float *d = reinterpret_cast<float *>(instance_data.modify(instances.size()-1)+matrix_offset);
+       float *d = reinterpret_cast<float *>(instance_data.modify(index)+matrix_offset);
        for(unsigned i=0; i<12; ++i)
                d[i] = m(i/4, i%4);
 }
@@ -107,6 +107,7 @@ void InstanceArray::render(Renderer &renderer, Tag tag) const
                instance_buffer->storage(instance_data.get_required_buffer_size(), STREAMING);
 
        Renderer::Push push(renderer);
+       renderer.set_pipeline_key(this, tag.id);
        method->apply(renderer);
        mesh->draw_instanced(renderer, vtx_setup, instances.size());
 }