diff --git a/src/CRE/mdl/disp_manager.cpp b/src/CRE/mdl/disp_manager.cpp index d50765ae..cbca6faf 100644 --- a/src/CRE/mdl/disp_manager.cpp +++ b/src/CRE/mdl/disp_manager.cpp @@ -2715,35 +2715,23 @@ namespace mdl { if (!data) continue; -#if SHARED_OBJECT_BUFFER GLuint morph_vertex_buffer = 0; size_t morph_vertex_buffer_offset = 0; if (obj_morph_vertex_buf) { morph_vertex_buffer = obj_morph_vertex_buf[i].get_buffer(); morph_vertex_buffer_offset = obj_morph_vertex_buf[i].get_offset(); } -#else - GLuint morph_vertex_buffer = 0; - if (obj_morph_vertex_buf) - morph_vertex_buffer = obj_morph_vertex_buf[i].get_buffer(); -#endif GLuint index_buffer = 0; if (obj_index_buf) index_buffer = obj_index_buf[i].buffer; -#if SHARED_OBJECT_BUFFER GLuint vertex_buffer = 0; size_t vertex_buffer_offset = 0; if (obj_vertex_buf) { vertex_buffer = obj_vertex_buf[i].get_buffer(); vertex_buffer_offset = obj_vertex_buf[i].get_offset(); } -#else - GLuint vertex_buffer = 0; - if (obj_vertex_buf) - vertex_buffer = obj_vertex_buf[i].get_buffer(); -#endif if (!vertex_buffer || !index_buffer || obj_morph_vertex_buf && !morph_vertex_buffer) { printf_debug("mdl::DispManager::entry_obj: no vertex or index mesh buffer to draw;\n"); diff --git a/src/CRE/object.cpp b/src/CRE/object.cpp index dafaed55..77738258 100644 --- a/src/CRE/object.cpp +++ b/src/CRE/object.cpp @@ -135,13 +135,13 @@ GLuint obj_mesh_vertex_buffer::get_buffer() { return 0; } -#if SHARED_OBJECT_BUFFER size_t obj_mesh_vertex_buffer::get_offset() { +#if SHARED_OBJECT_BUFFER if (buffers[0]) return offset; +#endif return 0; } -#endif GLsizeiptr obj_mesh_vertex_buffer::get_size() { if (buffers[0]) diff --git a/src/CRE/object.hpp b/src/CRE/object.hpp index 53bc3c5f..45fe69a6 100644 --- a/src/CRE/object.hpp +++ b/src/CRE/object.hpp @@ -44,9 +44,7 @@ struct obj_mesh_vertex_buffer { void cycle_index(); GLuint get_buffer(); -#if SHARED_OBJECT_BUFFER size_t get_offset(); -#endif GLsizeiptr get_size(); bool load(obj_mesh& mesh, bool dynamic = false); bool load_data(size_t size, const void* data, int32_t count, bool dynamic);