Refresh lighting and culling uniforms if the camera changes in pop_state

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

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 44568697f4f6dfd46aca884b9a6ebb8cffc05db3..55d7fc0648df0920dfb93419344d6ee53fdd30a5 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,4 +1,5 @@
 #include <msp/gl/extensions/arb_vertex_array_object.h>
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include <msp/gl/extensions/nv_primitive_restart.h>
 #include "buffer.h"
@@ -29,7 +30,7 @@ void Mesh::init(ResourceManager *rm)
        vbuf = 0;
        ibuf = 0;
        vao_id = 0;
-       defer_buffers = true;
+       defer_buffers = ARB_vertex_buffer_object;
        dirty = true;
        disallow_rendering = false;
        winding = 0;
@@ -40,6 +41,7 @@ void Mesh::init(ResourceManager *rm)
 
 Mesh::~Mesh()
 {
+       set_manager(0);
        delete vbuf;
        delete ibuf;
        if(vao_id)
@@ -200,7 +202,7 @@ void Mesh::unbind()
                glBindVertexArray(0);
 }
 
-Resource::AsyncLoader *Mesh::load(IO::Seekable &io)
+Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
 {
        return new AsyncLoader(*this, io);
 }