Browse Source

Fixed VertexIndex::getElementSize

Alex Szpakowski 12 years ago
parent
commit
a76ffd5715

+ 1 - 1
src/modules/graphics/opengl/VertexBuffer.cpp

@@ -248,12 +248,12 @@ void VBO::unload(bool save)
 // VertexIndex
 // VertexIndex
 
 
 size_t VertexIndex::maxSize = 0;
 size_t VertexIndex::maxSize = 0;
+size_t VertexIndex::elementSize = 0;
 std::list<size_t> VertexIndex::sizeRefs;
 std::list<size_t> VertexIndex::sizeRefs;
 VertexBuffer *VertexIndex::element_array = NULL;
 VertexBuffer *VertexIndex::element_array = NULL;
 
 
 VertexIndex::VertexIndex(size_t size)
 VertexIndex::VertexIndex(size_t size)
 	: size(size)
 	: size(size)
-	, elementSize(0)
 {
 {
 	// The upper limit is the maximum of GLuint divided by six (the number
 	// 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
 	// of indices per size) and divided by the size of GLuint. This guarantees

+ 1 - 2
src/modules/graphics/opengl/VertexBuffer.h

@@ -469,8 +469,7 @@ private:
 	size_t size;
 	size_t size;
 
 
 	// The size in bytes of an element in the element array.
 	// 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.
 	// The current VertexBuffer size. 0 means no VertexBuffer.
 	static size_t maxSize;
 	static size_t maxSize;
 	// The list of sizes. Needs to be kept sorted in ascending order.
 	// The list of sizes. Needs to be kept sorted in ascending order.