chiark / gitweb /
Commented out platform mesh loading for Ultimaker and Witbox until licensing is chang...
authorSteven Abadie <sabadie31@gmail.com>
Sun, 21 Sep 2014 23:03:29 +0000 (17:03 -0600)
committerSteven Abadie <sabadie31@gmail.com>
Sun, 21 Sep 2014 23:03:29 +0000 (17:03 -0600)
Cura/gui/sceneView.py

index c90bf6a3824bdafd771e2fa845942a6e3e851cb7..f35be5e91b0d8f14504b4b99cd36561904746545 100644 (file)
@@ -1237,7 +1237,9 @@ class SceneView(openglGui.glGuiPanel):
                size = [profile.getMachineSettingFloat('machine_width'), profile.getMachineSettingFloat('machine_depth'), profile.getMachineSettingFloat('machine_height')]
 
                machine = profile.getMachineSetting('machine_type')
-               if machine.startswith('ultimaker'):
+       
+               #Due to NC licensing, temporarily removing platform mesh loading for Ultimaker and Witbox
+               '''if machine.startswith('ultimaker'):
                        if machine not in self._platformMesh:
                                meshes = meshLoader.loadMeshes(resources.getPathForMesh(machine + '_platform.stl'))
                                if len(meshes) > 0:
@@ -1307,17 +1309,18 @@ class SceneView(openglGui.glGuiPanel):
                        self._objectShader.bind()
                        self._renderObject(self._platformMesh[machine], False, False)
                        self._objectShader.unbind()
-               else:
-                       glColor4f(0,0,0,1)
-                       glLineWidth(3)
-                       glBegin(GL_LINES)
-                       glVertex3f(-size[0] / 2, -size[1] / 2, 0)
-                       glVertex3f(-size[0] / 2, -size[1] / 2, 10)
-                       glVertex3f(-size[0] / 2, -size[1] / 2, 0)
-                       glVertex3f(-size[0] / 2+10, -size[1] / 2, 0)
-                       glVertex3f(-size[0] / 2, -size[1] / 2, 0)
-                       glVertex3f(-size[0] / 2, -size[1] / 2+10, 0)
-                       glEnd()
+               '''
+               
+               glColor4f(0,0,0,1)
+               glLineWidth(3)
+               glBegin(GL_LINES)
+               glVertex3f(-size[0] / 2, -size[1] / 2, 0)
+               glVertex3f(-size[0] / 2, -size[1] / 2, 10)
+               glVertex3f(-size[0] / 2, -size[1] / 2, 0)
+               glVertex3f(-size[0] / 2+10, -size[1] / 2, 0)
+               glVertex3f(-size[0] / 2, -size[1] / 2, 0)
+               glVertex3f(-size[0] / 2, -size[1] / 2+10, 0)
+               glEnd()
 
                glDepthMask(False)