Merge branch 'master' into CURA-5768_layer_view_skip_empty_layers

This commit is contained in:
Diego Prado Gesto 2018-10-05 10:52:23 +02:00
commit fc7c3390be

View File

@ -718,6 +718,8 @@ class BuildVolume(SceneNode):
# Add prime tower location as disallowed area. # Add prime tower location as disallowed area.
if len(used_extruders) > 1: #No prime tower in single-extrusion. if len(used_extruders) > 1: #No prime tower in single-extrusion.
if len([x for x in used_extruders if x.isEnabled == True]) > 1: #No prime tower if only one extruder is enabled
prime_tower_collision = False prime_tower_collision = False
prime_tower_areas = self._computeDisallowedAreasPrinted(used_extruders) prime_tower_areas = self._computeDisallowedAreasPrinted(used_extruders)
for extruder_id in prime_tower_areas: for extruder_id in prime_tower_areas: