3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Added inherited_files property

Browse source
This commit is contained in:
Jaime van Kessel 2016-08-30 14:51:27 +02:00
parent 6a2e5ffe77
commit 7a54f21633
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -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):