From 7a54f21633eccad82c88c15adbc7b8e899d0cdc4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 30 Aug 2016 14:51:27 +0200 Subject: [PATCH] Added inherited_files property --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index c1db8f8f2f..f9d2fc4e4b 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -20,6 +20,7 @@ import UM.Settings class XmlMaterialProfile(UM.Settings.InstanceContainer): def __init__(self, container_id, *args, **kwargs): super().__init__(container_id, *args, **kwargs) + self._inherited_files = [] ## Overridden from InstanceContainer def duplicate(self, new_id, new_name = None): @@ -262,11 +263,10 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): def _loadFile(self, file_name): path = Resources.getPath(CuraApplication.getInstance().ResourceTypes.MaterialInstanceContainer, file_name + ".xml.fdm_material") - contents = {} with open(path, encoding="utf-8") as f: contents = f.read() - #self._inherited_files.append(path) + self._inherited_files.append(path) return ET.fromstring(contents) def _mergeXML(self, first, second):