From 631ef8e6784f38aa8948809eae4ba369e438e1c9 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Wed, 22 Jun 2016 15:06:03 +0200 Subject: [PATCH] Reimplement the "no convex hull when using a tool" functionality. Contributes to CURA-1504 --- cura/ConvexHullDecorator.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index 29fa3bce0a..9fccd46988 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -17,6 +17,9 @@ class ConvexHullDecorator(SceneNodeDecorator): self._global_stack = None Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) + Application.getInstance().getController().toolOperationStarted.connect(self._onChanged) + Application.getInstance().getController().toolOperationStopped.connect(self._onChanged) + self._onGlobalStackChanged() def setNode(self, node): @@ -80,8 +83,9 @@ class ConvexHullDecorator(SceneNodeDecorator): return None def recomputeConvexHull(self): - root = Application.getInstance().getController().getScene().getRoot() - if self._node is None or not self.__isDescendant(root, self._node): + controller = Application.getInstance().getController() + root = controller.getScene().getRoot() + if self._node is None or controller.isToolOperationActive() or not self.__isDescendant(root, self._node): if self._convex_hull_node: self._convex_hull_node.setParent(None) self._convex_hull_node = None