From b65977a595801d16244a0bf5049a86e967e8753e Mon Sep 17 00:00:00 2001 From: daid Date: Tue, 31 Jul 2012 16:12:02 +0200 Subject: [PATCH] Fix X-Ray view. Broken after Numpy update. --- Cura/gui/opengl.py | 1 + Cura/gui/preview3d.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py index 4cf97405..c227600d 100644 --- a/Cura/gui/opengl.py +++ b/Cura/gui/opengl.py @@ -216,6 +216,7 @@ def DrawSTL(mesh): glCullFace(GL_FRONT) glNormalPointer(GL_FLOAT, 0, mesh.invNormal) glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount) + glCullFace(GL_BACK) glDisableClientState(GL_VERTEX_ARRAY) glDisableClientState(GL_NORMAL_ARRAY); diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index 75aeafc2..27605a3d 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -555,17 +555,17 @@ class PreviewGLCanvas(glcanvas.GLCanvas): elif self.viewMode == "X-Ray": glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE) glDisable(GL_DEPTH_TEST) - glEnable(GL_STENCIL_TEST); + glEnable(GL_STENCIL_TEST) glStencilFunc(GL_ALWAYS, 1, 1) glStencilOp(GL_INCR, GL_INCR, GL_INCR) self.drawModel(obj) glStencilOp (GL_KEEP, GL_KEEP, GL_KEEP); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE) - glStencilFunc(GL_EQUAL, 0, 1); + glStencilFunc(GL_EQUAL, 0, 1) glColor(1, 1, 1) self.drawModel(obj) - glStencilFunc(GL_EQUAL, 1, 1); + glStencilFunc(GL_EQUAL, 1, 1) glColor(1, 0, 0) self.drawModel(obj) @@ -591,7 +591,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas): glEnd() glPopMatrix() - glDisable(GL_STENCIL_TEST); + glDisable(GL_STENCIL_TEST) glEnable(GL_DEPTH_TEST) elif self.viewMode == "Normal": glLightfv(GL_LIGHT0, GL_DIFFUSE, self.objColor[self.parent.objectList.index(obj)]) -- 2.30.2