CURA-4400 Apply correct shader to grouped nodes

This commit is contained in:
Ian Paschal 2018-03-20 16:54:34 +01:00
parent 5993847c4a
commit 9dc50ec73f
2 changed files with 10 additions and 5 deletions

View file

@ -238,7 +238,16 @@ class BuildVolume(SceneNode):
# Group nodes should override the _outside_buildarea property of their children. # Group nodes should override the _outside_buildarea property of their children.
for group_node in group_nodes: for group_node in group_nodes:
for child_node in group_node.getAllChildren(): children = group_node.getAllChildren()
# Check if one or more children are non-printable and if so, set the parent as non-printable:
for child_node in children:
if child_node.isOutsideBuildArea():
group_node.setOutsideBuildArea(True)
break
# Apply results of the check to all children of the group:
for child_node in children:
child_node.setOutsideBuildArea(group_node.isOutsideBuildArea()) child_node.setOutsideBuildArea(group_node.isOutsideBuildArea())
## Update the outsideBuildArea of a single node, given bounds or current build volume ## Update the outsideBuildArea of a single node, given bounds or current build volume

View file

@ -197,10 +197,6 @@ class StartSliceJob(Job):
if getattr(node, "_outside_buildarea", False) and not is_non_printing_mesh: if getattr(node, "_outside_buildarea", False) and not is_non_printing_mesh:
continue continue
#node_position = node.callDecoration("getActiveExtruderPosition")
#if not stack.extruders[str(node_position)].isEnabled:
# continue
temp_list.append(node) temp_list.append(node)
if not is_non_printing_mesh: if not is_non_printing_mesh:
has_printing_mesh = True has_printing_mesh = True