diff options
| -rw-r--r-- | cura/ConvexHullJob.py | 2 | ||||
| -rw-r--r-- | cura/ConvexHullNode.py | 2 | ||||
| -rw-r--r-- | cura/OneAtATimeIterator.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cura/ConvexHullJob.py b/cura/ConvexHullJob.py index 9de4f13073..0399148025 100644 --- a/cura/ConvexHullJob.py +++ b/cura/ConvexHullJob.py @@ -45,7 +45,7 @@ class ConvexHullJob(Job): # Then, do a Minkowski hull with a simple 1x1 quad to outset and round the normal convex hull. # This is done because of rounding errors. hull = hull.getMinkowskiHull(Polygon(numpy.array([[-1, -1], [-1, 1], [1, 1], [1, -1]], numpy.float32))) - settings = Application.getInstance().getActiveMachine() + settings = Application.getInstance().getMachineManager().getActiveMachineInstance() if settings.getSettingValueByKey("print_sequence") == "One at a time" and not self._node.getParent().callDecoration("isGroup"): # Printing one at a time and it's not an object in a group diff --git a/cura/ConvexHullNode.py b/cura/ConvexHullNode.py index e24d79522c..6d56fd7364 100644 --- a/cura/ConvexHullNode.py +++ b/cura/ConvexHullNode.py @@ -53,7 +53,7 @@ class ConvexHullNode(SceneNode): def render(self, renderer): if not self._material: - self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag")) + self._material = renderer.createMaterial(Resources.getPath(Resources.Shaders, "basic.vert"), Resources.getPath(Resources.Shaders, "color.frag")) self._material.setUniformValue("u_color", Color(35, 35, 35, 128)) if self.getParent(): diff --git a/cura/OneAtATimeIterator.py b/cura/OneAtATimeIterator.py index 958d1e5b5f..35adba90b3 100644 --- a/cura/OneAtATimeIterator.py +++ b/cura/OneAtATimeIterator.py @@ -17,7 +17,7 @@ class OneAtATimeIterator(Iterator.Iterator): def _fillStack(self): node_list = [] for node in self._scene_node.getChildren(): - if node.getBoundingBox().height > Application.getInstance().getActiveMachine().getSettingValueByKey("gantry_height"): + if node.getBoundingBox().height > Application.getInstance().getMachineManager().getActiveMachineInstance().getSettingValueByKey("gantry_height"): return if node.callDecoration("getConvexHull"): node_list.append(node) @@ -103,4 +103,4 @@ class _objectOrder(): """ self.order = order self.todo = todo -
\ No newline at end of file + |