From cce94c80432c0d51d3a7f3189acb740ba650e5c8 Mon Sep 17 00:00:00 2001
From: Simon Edwards <s.edwards@ultimaker.com>
Date: Wed, 7 Sep 2016 11:29:37 +0200
Subject: [PATCH] Added skin_overlap <= infill_overlap mapping. Contributes to
 CURA-844 Profile converter 2.1 ==> 2.2

---
 plugins/LegacyProfileReader/DictionaryOfDoom.json              | 3 ++-
 .../VersionUpgrade21to22/VersionUpgrade21to22.py               | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/LegacyProfileReader/DictionaryOfDoom.json b/plugins/LegacyProfileReader/DictionaryOfDoom.json
index db0d26b8e4..15ef792f83 100644
--- a/plugins/LegacyProfileReader/DictionaryOfDoom.json
+++ b/plugins/LegacyProfileReader/DictionaryOfDoom.json
@@ -70,7 +70,8 @@
         "magic_spiralize": "spiralize",
         "prime_tower_enable": "wipe_tower",
         "prime_tower_size": "math.sqrt(float(wipe_tower_volume) / float(layer_height))",
-        "ooze_shield_enabled": "ooze_shield"
+        "ooze_shield_enabled": "ooze_shield",
+        "skin_overlap": "fill_overlap"
     },
 
     "defaults": {
diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py b/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py
index 0c3a4d1055..c8ec559702 100644
--- a/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py
+++ b/plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py
@@ -279,6 +279,8 @@ class VersionUpgrade21to22(VersionUpgrade):
             elif key in _setting_name_translations:
                 del settings[key]
                 settings[_setting_name_translations[key]] = value
+        if "infill_overlap" in settings:    # New setting, added in 2.3
+            settings["skin_overlap"] = settings["infill_overlap"]
         return settings
 
     ##  Translates a setting name for the change from Cura 2.1 to 2.2.