Add the 3D clips to the UM2 bed and fix the right size clip sizes.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index dda4d433e0d134db45636ecffa7d9a0463ec92b2..47c7831de17603d90beb64231d99218dd5e9608e 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -1269,9 +1269,9 @@ class SceneView(openglGui.glGuiPanel):
                        texture_scale = 1.0
                        if machine_type == 'ultimaker2' or machine_type == 'ultimaker2extended':
                                filename = resources.getPathForMesh('ultimaker2_platform.stl')
-                               offset = [0,-37,145]
+                               offset = [-9,-37,145]
                                texture_name = 'Ultimaker2backplate.png'
-                               texture_offset = [0,150,-5]
+                               texture_offset = [9,150,-5]
                        elif machine_type == 'ultimaker2go':
                                filename = resources.getPathForMesh('ultimaker2go_platform.stl')
                                offset = [0,-42,145]

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index ffd7e966e938bf47a89202f1f25149a9cf60884f..8ce2dc6fb54abb4a9d80a0ebcfa3993f0d8d5d09 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -1184,11 +1184,14 @@ def getMachineSizePolygons():
        if getMachineSetting('machine_type').startswith('ultimaker2'):
                #UM2 no-go zones
                w = 25
+               w2 = 5
                h = 8
+               if getMachineSetting('machine_type') == 'ultimaker2go':
+                       w2 = 25
                ret.append(numpy.array([[-size[0]/2,-size[1]/2],[-size[0]/2+w+2,-size[1]/2], [-size[0]/2+w,-size[1]/2+h], [-size[0]/2,-size[1]/2+h]], numpy.float32))
-               ret.append(numpy.array([[ size[0]/2-w-2,-size[1]/2],[ size[0]/2,-size[1]/2], [ size[0]/2,-size[1]/2+h],[ size[0]/2-w,-size[1]/2+h]], numpy.float32))
+               ret.append(numpy.array([[ size[0]/2-w2-2,-size[1]/2],[ size[0]/2,-size[1]/2], [ size[0]/2,-size[1]/2+h],[ size[0]/2-w2,-size[1]/2+h]], numpy.float32))
                ret.append(numpy.array([[-size[0]/2+w+2, size[1]/2],[-size[0]/2, size[1]/2], [-size[0]/2, size[1]/2-h],[-size[0]/2+w, size[1]/2-h]], numpy.float32))
-               ret.append(numpy.array([[ size[0]/2, size[1]/2],[ size[0]/2-w-2, size[1]/2], [ size[0]/2-w, size[1]/2-h],[ size[0]/2, size[1]/2-h]], numpy.float32))
+               ret.append(numpy.array([[ size[0]/2, size[1]/2],[ size[0]/2-w2-2, size[1]/2], [ size[0]/2-w2, size[1]/2-h],[ size[0]/2, size[1]/2-h]], numpy.float32))
        return ret
 
 #returns the number of extruders minimal used. Normally this returns 1, but with dual-extrusion support material it returns 2

diff --git a/resources/meshes/ultimaker2_platform.stl b/resources/meshes/ultimaker2_platform.stl
index 5a1bb14001ab6ddb0610165292f2c6fc6e65165b..561079d3868e81ceba87758d57cd28df87763f72 100644 (file)
Binary files a/resources/meshes/ultimaker2_platform.stl and b/resources/meshes/ultimaker2_platform.stl differ