From 51547bf37a03e53506714daec3f53611f28348fe Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 4 Sep 2017 15:49:54 +0200 Subject: [PATCH] Update setting_version to 3 for XMLMaterial CURA-4270 Technically, this is not right. This is just to postpone a time bomb... The XML material profile needs a setting number instead of getting it derived from the schema version. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- plugins/XmlMaterialProfile/__init__.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index c81e23b219..a9acf9bec9 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -35,7 +35,7 @@ class XmlMaterialProfile(InstanceContainer): # \return The corresponding setting_version. def xmlVersionToSettingVersion(self, xml_version: str) -> int: if xml_version == "1.3": - return 2 + return 3 return 0 #Older than 1.3. def getInheritedFiles(self): diff --git a/plugins/XmlMaterialProfile/__init__.py b/plugins/XmlMaterialProfile/__init__.py index f38b5ca0ef..69c64193b7 100644 --- a/plugins/XmlMaterialProfile/__init__.py +++ b/plugins/XmlMaterialProfile/__init__.py @@ -19,8 +19,7 @@ def getMetaData(): "mimetype": "application/x-ultimaker-material-profile" }, "version_upgrade": { - ("materials", 1000000): ("materials", 1000002, upgrader.upgradeMaterial), - ("materials", 1000000): ("materials", 1000002, upgrader.upgradeMaterial), + ("materials", 1000000): ("materials", 1000003, upgrader.upgradeMaterial), }, "sources": { "materials": {