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

3 files changed, 24 insertions, 5 deletions

diff --git a/src/fffProcessor.h b/src/fffProcessor.h
index 34fb2a8cf4..425a3b1db3 100644
--- a/src/fffProcessor.h
+++ b/src/fffProcessor.h
@@ -540,7 +540,7 @@ private:
             gcodeLayer.setAlwaysRetract(true);
             gcodeLayer.addPolygonsByOptimizer(storage.oozeShield[layerNr], &skirtConfig);
             sendPolygonsToGui("oozeshield", layerNr, layer->printZ, storage.oozeShield[layerNr]);
-            gcodeLayer.setAlwaysRetract(!config.enableCombing);
+            gcodeLayer.setAlwaysRetract(config.enableCombing == COMBING_OFF);
         }
 
         if (config.simpleMode)
@@ -595,10 +595,14 @@ private:
         {
             SliceLayerPart* part = &layer->parts[partOrderOptimizer.polyOrder[partCounter]];
 
-            if (config.enableCombing)
-                gcodeLayer.setCombBoundary(&part->combBoundery);
-            else
+            if (config.enableCombing == COMBING_OFF)
+            {
                 gcodeLayer.setAlwaysRetract(true);
+            }else
+            {
+                gcodeLayer.setCombBoundary(&part->combBoundery);
+                gcodeLayer.setAlwaysRetract(false);
+            }
 
             Polygons infillPolygons;
             int fillAngle = 45;
@@ -669,6 +673,11 @@ private:
                     bridge = bridgeAngle(outline, &storage.volumes[volumeIdx].layers[layerNr-1]);
                 generateLineInfill(outline, skinPolygons, extrusionWidth, extrusionWidth, config.infillOverlap, (bridge > -1) ? bridge : fillAngle);
             }
+            if (config.enableCombing == COMBING_NOSKIN)
+            {
+                gcodeLayer.setCombBoundary(nullptr);
+                gcodeLayer.setAlwaysRetract(true);
+            }
             gcodeLayer.addPolygonsByOptimizer(skinPolygons, &skinConfig);
 
 
diff --git a/src/settings.cpp b/src/settings.cpp
index d38200d8eb..5274eb7b00 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -61,7 +61,7 @@ ConfigSettings::ConfigSettings()
     SETTING(minimalExtrusionBeforeRetraction, 100);
     SETTING(retractionZHop, 0);
 
-    SETTING(enableCombing, 1);
+    SETTING(enableCombing, COMBING_ALL);
     SETTING(enableOozeShield, 0);
     SETTING(wipeTowerSize, 0);
     SETTING(multiVolumeOverlap, 0);
diff --git a/src/settings.h b/src/settings.h
index b97bcf5fa1..bf8825c834 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -101,6 +101,16 @@ enum Infill_Pattern
     INFILL_CONCENTRIC = 3,
 };
 
+/**
+ * Where to use the combing feature
+ */
+enum Combing_Feature
+{
+    COMBING_OFF = 0,
+    COMBING_ALL = 1,
+    COMBING_NOSKIN = 2,
+};
+
 class _ConfigSettingIndex
 {
 public: