From: daid Date: Thu, 20 Jun 2013 12:09:39 +0000 (+0200) Subject: Small bugfix on the VBOs. X-Git-Tag: 13.06.3~3 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1dc38b4ec071ed89c0068243da4950a1555cf370;p=cura.git Small bugfix on the VBOs. --- diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index 71f08721..00a9d16c 100644 --- 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 074c81c5..c184584e 100644 --- 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 26ae119a..599aaed1 100644 --- 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