Small bugfix on the VBOs.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 71f0872100222b138c2616be5a2386af1e3f5ef6..00a9d16c76c3087ebdd2670129a3997792401184 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -1143,6 +1143,7 @@ void main(void)
                glDrawArrays(GL_QUADS, 4, 8)
                glColor4ub(5, 171, 231, 128)
                glDrawArrays(GL_QUADS, 12, 8)
+               glDisableClientState(GL_VERTEX_ARRAY)
 
                sx = self._machineSize[0]
                sy = self._machineSize[1]
@@ -1167,7 +1168,6 @@ void main(void)
                                glVertex3f(x1, y2, -0.02)
                                glEnd()
 
-               glDisableClientState(GL_VERTEX_ARRAY)
                glDisable(GL_BLEND)
                glDisable(GL_CULL_FACE)
 

diff --git a/Cura/gui/util/opengl.py b/Cura/gui/util/opengl.py
index 074c81c545d98b38fc9623b1b49ea3210ea32869..c184584ea03f259a286c4658804326654f161623 100644 (file)
--- a/Cura/gui/util/opengl.py
+++ b/Cura/gui/util/opengl.py
@@ -173,7 +173,7 @@ class GLVBO(GLReferenceCounter):
                for i in xrange(0, int(self._size / batchSize)):
                        glDrawArrays(render_type, i * batchSize, batchSize)
                glDrawArrays(render_type, extraStartPos, extraCount)
-               if self._buffer is None:
+               if self._buffer is not None:
                        glBindBuffer(GL_ARRAY_BUFFER, 0)
 
                glDisableClientState(GL_VERTEX_ARRAY)

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 26ae119ab0a925b011b1e9f2d7fae677cc329081..599aaed15ff17cf2aeb0a733451eabef34e38031 100644 (file)
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -124,7 +124,7 @@ class glGuiContainer(glGuiControl):
 
 class glGuiPanel(glcanvas.GLCanvas):
        def __init__(self, parent):
-               attribList = (glcanvas.WX_GL_RGBA, glcanvas.WX_GL_DOUBLEBUFFER, glcanvas.WX_GL_DEPTH_SIZE, 32, glcanvas.WX_GL_STENCIL_SIZE, 8)
+               attribList = (glcanvas.WX_GL_RGBA, glcanvas.WX_GL_DOUBLEBUFFER, glcanvas.WX_GL_DEPTH_SIZE, 32, glcanvas.WX_GL_STENCIL_SIZE, 8, 0)
                glcanvas.GLCanvas.__init__(self, parent, style=wx.WANTS_CHARS, attribList = attribList)
                self._base = self
                self._focus = None