diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2016-10-27 10:58:05 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2016-10-27 10:59:29 +0300 |
| commit | e27be7fc4b1a7c1b7516b23b2400c09510791dc9 (patch) | |
| tree | e01b7fc1b9de0b08178d1fb951ed748865317037 /cura | |
| parent | 51263da2e41292afc37d8a272b588a231b54baf2 (diff) | |
Travel_avoid_distance and support_offset are only taken into account if respecive feature is active
We used to always add them, but now we check if support_enable and travel_avoid_other_parts are enabled
CURA-2823
Diffstat (limited to 'cura')
| -rw-r--r-- | cura/BuildVolume.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index ce9967a5a2..e0153b4905 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -553,7 +553,7 @@ class BuildVolume(SceneNode): raise Exception("Unknown bed adhesion type. Did you forget to update the build volume calculations for your new bed adhesion type?") support_expansion = 0 - if self._getSettingFromSupportInfillExtruder("support_offset"): + if self._getSettingFromSupportInfillExtruder("support_offset") and self._global_container_stack.getProperty("support_enable", "value"): support_expansion += self._getSettingFromSupportInfillExtruder("support_offset") farthest_shield_distance = 0 @@ -565,7 +565,7 @@ class BuildVolume(SceneNode): move_from_wall_radius = 0 # Moves that start from outer wall. if self._getSettingFromAdhesionExtruder("infill_wipe_dist"): move_from_wall_radius = max(move_from_wall_radius, self._getSettingFromAdhesionExtruder("infill_wipe_dist")) - if self._getSettingFromAdhesionExtruder("travel_avoid_distance"): + if self._getSettingFromAdhesionExtruder("travel_avoid_distance") and self._getSettingFromAdhesionExtruder("travel_avoid_other_parts"): move_from_wall_radius = max(move_from_wall_radius, self._getSettingFromAdhesionExtruder("travel_avoid_distance")) #Now combine our different pieces of data to get the final border size. @@ -582,4 +582,4 @@ class BuildVolume(SceneNode): _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "extruder_prime_pos_z"] _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y"] _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"] - _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset"] + _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts"] |