Duplicating a container no longer forces unique GUID

CURA-1969
This commit is contained in:
Jaime van Kessel 2016-08-18 10:55:51 +02:00
parent 0061e1329c
commit 37e4b9e940
2 changed files with 2 additions and 7 deletions

View file

@ -21,13 +21,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
## Overridden from InstanceContainer
def duplicate(self, new_id, new_name = None):
base_file = self.getMetaDataEntry("base_file", None)
new_uuid = str(uuid.uuid4())
if base_file:
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = base_file)
if containers:
new_basefile = containers[0].duplicate(self.getMetaDataEntry("brand") + "_" + new_id, new_name)
new_basefile.setMetaDataEntry("GUID", new_uuid)
base_file = new_basefile.id
UM.Settings.ContainerRegistry.getInstance().addContainer(new_basefile)
@ -39,7 +37,6 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
new_id += "_" + variant_containers[0].getName().replace(" ", "_")
result = super().duplicate(new_id, new_name)
result.setMetaDataEntry("GUID", new_uuid)
if result.getMetaDataEntry("base_file", None):
result.setMetaDataEntry("base_file", base_file)
return result