Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
Tamara Hogenhout 2016-01-15 16:18:46 +01:00
commit 26d27e4664
2 changed files with 21 additions and 15 deletions

View file

@ -18,7 +18,12 @@ class ConvexHullDecorator(SceneNodeDecorator):
self._profile = None
Application.getInstance().getMachineManager().activeProfileChanged.connect(self._onActiveProfileChanged)
self._onActiveProfileChanged()
## Force that a new (empty) object is created upon copy.
def __deepcopy__(self, memo):
copy = ConvexHullDecorator()
return copy
def getConvexHull(self):
return self._convex_hull