From 87b0063266f395218c98e300b41dbc5b3f4c3013 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 26 Sep 2016 13:51:42 +0200 Subject: [PATCH] Ooze & draft shield distances are now only used if greater than brim / skirt CURA-2407 --- cura/BuildVolume.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 9311b197b5..ec5efa9a20 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -503,10 +503,14 @@ class BuildVolume(SceneNode): skirt_size = self._getSettingProperty("raft_margin", "value") if container_stack.getProperty("draft_shield_enabled", "value"): - skirt_size += container_stack.getProperty("draft_shield_dist", "value") + draft_shield_dist = container_stack.getProperty("draft_shield_dist", "value") + if skirt_size < draft_shield_dist: + skirt_size = draft_shield_dist if container_stack.getProperty("ooze_shield_enabled", "value"): - skirt_size += container_stack.getProperty("ooze_shield_dist", "value") + ooze_shield_dist = container_stack.getProperty("ooze_shield_dist", "value") + if skirt_size < ooze_shield_dist: + skirt_size = ooze_shield_dist if container_stack.getProperty("xy_offset", "value"): skirt_size += container_stack.getProperty("xy_offset", "value")