Allow the skirt to be used as brim when the skirt distance is zero. This will hug...

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index c460b6f196fbcf4bfc21fe60210c098115ff7814..b5d03d3bd99239436fba2daaeb5af1cc49e369f1 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -246,7 +246,7 @@ def getProfileInformation():
                        'Support_Offset_Y_mm': lambda setting: -profile.getPreferenceFloat('extruder_offset_y1') if profile.getProfileSetting('support_dual_extrusion') == 'True' and int(profile.getPreference('extruder_amount')) > 1 else '0',
                },'skirt': {
                        'Skirt_line_count': storedSetting("skirt_line_count"),
-                       'Convex': "True",
+                       'Convex': lambda setting: "True" if profile.getProfileSettingFloat('skirt_gap') > 0.0 else "False",
                        'Gap_Width_mm': storedSetting("skirt_gap"),
                        'Layers_To_index': "1",
                },'joris': {

diff --git a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
index 51f3549c5bc73eb9cfc1b54e8e2c2f343eb83801..9dae41830def1ec6902e9884d4eff1f49acb91de 100644 (file)
--- a/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
+++ b/Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py
@@ -206,7 +206,7 @@ class SkirtSkein:
                outerLoops = getOuterLoops(loops)
                self.outsetLoops = []
                for i in xrange(self.repository.skirtLineCount.value, 0, -1):
-                       outsetLoops = intercircle.getInsetSeparateLoopsFromLoops(outerLoops, -self.skirtOutset - i * self.edgeWidth)
+                       outsetLoops = intercircle.getInsetSeparateLoopsFromLoops(outerLoops, -self.skirtOutset - (i-1) * self.edgeWidth)
                        outsetLoops = getOuterLoops(outsetLoops)
                        if self.repository.convex.value:
                                outsetLoops = [euclidean.getLoopConvex(euclidean.getConcatenatedList(outsetLoops))]