Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2019-04-04 20:07:16 +02:00
commit 13c56d40e7
2 changed files with 10 additions and 1 deletions

View file

@ -224,7 +224,16 @@ class ExtruderManager(QObject):
# Get the extruders of all printable meshes in the scene
meshes = [node for node in DepthFirstIterator(scene_root) if isinstance(node, SceneNode) and node.isSelectable()] #type: ignore #Ignore type error because iter() should get called automatically by Python syntax.
# Exclude anti-overhang meshes
mesh_list = []
for mesh in meshes:
stack = mesh.callDecoration("getStack")
if stack is not None and (stack.getProperty("anti_overhang_mesh", "value") or stack.getProperty("support_mesh", "value")):
continue
mesh_list.append(mesh)
for mesh in mesh_list:
extruder_stack_id = mesh.callDecoration("getActiveExtruder")
if not extruder_stack_id:
# No per-object settings for this node

View file

@ -121,7 +121,7 @@
"retraction_hop_enabled": {"value": false},
"retraction_hop": {"value": 1},
"retraction_combing": {"value": "off"},
"retraction_combing": {"value": "'off'"},
"cool_fan_speed": {"value": 0},
"cool_fan_enabled": {"value": true},