Refactor writing files in the Blender exporter

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

diff --git a/source/instancearray.cpp b/source/instancearray.cpp
index 29b59f09d9648e8f2474397852f6643910bef1c1..91f92084d94a680bde115f938b257bdabe8dbd29 100644 (file)
--- a/source/instancearray.cpp
+++ b/source/instancearray.cpp
@@ -62,6 +62,8 @@ InstanceArray::InstanceArray(const Object &o):
 
 InstanceArray::~InstanceArray()
 {
+       for(std::vector<ObjectInstance *>::iterator i=instances.begin(); i!=instances.end(); ++i)
+               delete *i;
        delete vtx_setup;
        delete instance_data;
        delete instance_buffer;
@@ -111,16 +113,16 @@ void InstanceArray::render(Renderer &renderer, const Tag &tag) const
                const Technique *tech = object.get_technique();
                if(!tech)
                        throw logic_error("no technique");
-               if(!tech->has_pass(tag))
+               const RenderPass *pass = tech->find_pass(tag);
+               if(!pass)
                        return;
-               const RenderPass &pass = tech->get_pass(tag);
 
                const Mesh *mesh = object.get_mesh();
                mesh->get_vertices().refresh();
                instance_data->refresh();
 
                Renderer::Push push(renderer);
-               pass.apply(renderer);
+               pass->apply(renderer);
                mesh->draw_instanced(renderer, *vtx_setup, instances.size());
        }
        else