T466: Removed cube, Changed label, Added clearing of scene

This commit is contained in:
Victor Larchenko 2016-10-13 16:55:24 +06:00 committed by Youness Alaoui
parent 0a75c3d19b
commit 333e501268
5 changed files with 34 additions and 14 deletions

View file

@ -581,7 +581,7 @@ class CuraApplication(QtApplication):
count = 0
scene_bounding_box = None
for node in DepthFirstIterator(self.getController().getScene().getRoot()):
if type(node) is not SceneNode or not node.getMeshData():
if type(node) is not SceneNode or (not node.getMeshData() and not hasattr(node, "gcode")):
continue
count += 1
@ -712,7 +712,7 @@ class CuraApplication(QtApplication):
for node in DepthFirstIterator(self.getController().getScene().getRoot()):
if type(node) is not SceneNode:
continue
if not node.getMeshData() and not node.callDecoration("isGroup"):
if (not node.getMeshData() and not hasattr(node, "gcode")) and not node.callDecoration("isGroup"):
continue # Node that doesnt have a mesh and is not a group.
if node.getParent() and node.getParent().callDecoration("isGroup"):
continue # Grouped nodes don't need resetting as their parent (the group) is resetted)