From a76ffd5715bf936ce9eeb53d379b515b3dd9b333 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 30 Jan 2013 19:01:14 -0400 Subject: [PATCH] Fixed VertexIndex::getElementSize --- src/modules/graphics/opengl/VertexBuffer.cpp | 2 +- src/modules/graphics/opengl/VertexBuffer.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/VertexBuffer.cpp b/src/modules/graphics/opengl/VertexBuffer.cpp index 4893ab5b4..7bf477df1 100644 --- a/src/modules/graphics/opengl/VertexBuffer.cpp +++ b/src/modules/graphics/opengl/VertexBuffer.cpp @@ -248,12 +248,12 @@ void VBO::unload(bool save) // VertexIndex size_t VertexIndex::maxSize = 0; +size_t VertexIndex::elementSize = 0; std::list VertexIndex::sizeRefs; VertexBuffer *VertexIndex::element_array = NULL; VertexIndex::VertexIndex(size_t size) : size(size) - , elementSize(0) { // The upper limit is the maximum of GLuint divided by six (the number // of indices per size) and divided by the size of GLuint. This guarantees diff --git a/src/modules/graphics/opengl/VertexBuffer.h b/src/modules/graphics/opengl/VertexBuffer.h index fbce635fe..ba07ffcd4 100644 --- a/src/modules/graphics/opengl/VertexBuffer.h +++ b/src/modules/graphics/opengl/VertexBuffer.h @@ -469,8 +469,7 @@ private: size_t size; // The size in bytes of an element in the element array. - size_t elementSize; - + static size_t elementSize; // The current VertexBuffer size. 0 means no VertexBuffer. static size_t maxSize; // The list of sizes. Needs to be kept sorted in ascending order.