Fix X-Ray view. Broken after Numpy update.

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 4cf97405a2c80a5cc8bc0d4ce4482c535edc7401..c227600d30624ca1fca365bddbf55eda788cc45b 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -216,6 +216,7 @@ def DrawSTL(mesh):
        glCullFace(GL_FRONT)\r
        glNormalPointer(GL_FLOAT, 0, mesh.invNormal)\r
        glDrawArrays(GL_TRIANGLES, 0, mesh.vertexCount)\r
+       glCullFace(GL_BACK)\r
        \r
        glDisableClientState(GL_VERTEX_ARRAY)\r
        glDisableClientState(GL_NORMAL_ARRAY);\r

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 75aeafc2f20e5193128e93547cb3d2fcbb24e321..27605a3d9ba8d7e6da6c3846c0a7d8f949b570ab 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -555,17 +555,17 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        elif self.viewMode == "X-Ray":\r
                                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE)\r
                                glDisable(GL_DEPTH_TEST)\r
-                               glEnable(GL_STENCIL_TEST);\r
+                               glEnable(GL_STENCIL_TEST)\r
                                glStencilFunc(GL_ALWAYS, 1, 1)\r
                                glStencilOp(GL_INCR, GL_INCR, GL_INCR)\r
                                self.drawModel(obj)\r
                                glStencilOp (GL_KEEP, GL_KEEP, GL_KEEP);\r
                                \r
                                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE)\r
-                               glStencilFunc(GL_EQUAL, 0, 1);\r
+                               glStencilFunc(GL_EQUAL, 0, 1)\r
                                glColor(1, 1, 1)\r
                                self.drawModel(obj)\r
-                               glStencilFunc(GL_EQUAL, 1, 1);\r
+                               glStencilFunc(GL_EQUAL, 1, 1)\r
                                glColor(1, 0, 0)\r
                                self.drawModel(obj)\r
 \r
@@ -591,7 +591,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                                        glEnd()\r
                                glPopMatrix()\r
 \r
-                               glDisable(GL_STENCIL_TEST);\r
+                               glDisable(GL_STENCIL_TEST)\r
                                glEnable(GL_DEPTH_TEST)\r
                        elif self.viewMode == "Normal":\r
                                glLightfv(GL_LIGHT0, GL_DIFFUSE, self.objColor[self.parent.objectList.index(obj)])\r