Merge pull request #601 from CapnBry/reloadscene

[cura.git] / Cura / gui / util / openglHelpers.py

diff --git a/Cura/gui/util/openglHelpers.py b/Cura/gui/util/openglHelpers.py
index ebf4c241ae2cd650ac3f7a253c7543a073c7b462..2b110094fbbc409a4f8fa40d1cdf7fe9f79fb01f 100644 (file)
--- a/Cura/gui/util/openglHelpers.py
+++ b/Cura/gui/util/openglHelpers.py
@@ -142,6 +142,8 @@ class GLVBO(GLReferenceCounter):
                        self._buffer = None
                        self._hasNormals = self._normalArray is not None
                        self._hasIndices = self._indicesArray is not None
+                       if self._hasIndices:
+                               self._size = len(indicesArray)
                else:
                        self._buffer = glGenBuffers(1)
                        self._size = len(vertexArray)
@@ -178,7 +180,10 @@ class GLVBO(GLReferenceCounter):
                                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, self._bufferIndices)
 
                if self._hasIndices:
-                       glDrawElements(self._renderType, self._size, GL_UNSIGNED_INT, c_void_p(0))
+                       if self._buffer is None:
+                               glDrawElements(self._renderType, self._size, GL_UNSIGNED_INT, self._indicesArray)
+                       else:
+                               glDrawElements(self._renderType, self._size, GL_UNSIGNED_INT, c_void_p(0))
                else:
                        batchSize = 996    #Warning, batchSize needs to be dividable by 4 (quads), 3 (triangles) and 2 (lines). Current value is magic.
                        extraStartPos = int(self._size / batchSize) * batchSize #leftovers.
@@ -203,6 +208,11 @@ class GLVBO(GLReferenceCounter):
                        glBindBuffer(GL_ARRAY_BUFFER, 0)
                        glDeleteBuffers(1, [self._buffer])
                        self._buffer = None
+                       if self._hasIndices:
+                               glBindBuffer(GL_ARRAY_BUFFER, self._bufferIndices)
+                               glBufferData(GL_ARRAY_BUFFER, None, GL_STATIC_DRAW)
+                               glBindBuffer(GL_ARRAY_BUFFER, 0)
+                               glDeleteBuffers(1, [self._bufferIndices])
                self._vertexArray = None
                self._normalArray = None