Remove the deprecated ProgramBuilder class

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 51468f2f85f850cd7b59405b97e7e2ff17e32432..dba8a9915489aede7906f8a684b9d59e288428b5 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -40,6 +40,7 @@ void Mesh::init(ResourceManager *rm)
 Mesh::~Mesh()
 {
        set_manager(0);
+       batches.clear();
        delete vbuf;
        delete ibuf;
 }
@@ -230,7 +231,7 @@ void Mesh::Loader::vertices(const vector<VertexComponent> &c)
        if(allow_gl_calls)
        {
                obj.check_buffers(VERTEX_BUFFER);
-               obj.vtx_setup.set_vertex_array(obj.vertices);
+               obj.vtx_setup.refresh();
        }
 }
 
@@ -285,7 +286,7 @@ bool Mesh::AsyncLoader::process()
        else if(phase==1)
        {
                mesh.resize_buffers();
-               mesh.vtx_setup.set_vertex_array(vertices);
+               mesh.vtx_setup.refresh();
                vertex_updater = mesh.vertices.refresh_async();
                if(!mesh.batches.empty())
                        index_updater = mesh.batches.front().refresh_async();