GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-14 05:33:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crashes when duplicating a material

Browse Source 
CURA-6600
This commit is contained in:
Jaime van Kessel 2019-08-19 11:42:52 +02:00
parent dc26f98a3a
commit 2417705dfd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Machines/VariantManager.py
View File

@ -115,7 +115,7 @@ class VariantManager:
variant_type: Optional["VariantType"] = None) -> Optional["ContainerNode"]: variant_type: Optional["VariantType"] = None) -> Optional["ContainerNode"]:
if variant_type is None: if variant_type is None:
variant_node = None variant_node = None
variant_type_dict = self._machine_to_variant_dict_map[machine_definition_id] variant_type_dict = self._machine_to_variant_dict_map.get("machine_definition_id", {})
for variant_dict in variant_type_dict.values(): for variant_dict in variant_type_dict.values():
if variant_name in variant_dict: if variant_name in variant_dict:
variant_node = variant_dict[variant_name] variant_node = variant_dict[variant_name]

5
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -244,7 +244,10 @@ class XmlMaterialProfile(InstanceContainer):
variant_name = container.getMetaDataEntry("variant_name") variant_name = container.getMetaDataEntry("variant_name")
if variant_name: if variant_name:
variant_dict = {"variant_node": variant_manager.getVariantNode(definition_id, variant_name), variant_node = variant_manager.getVariantNode(definition_id, variant_name)
if variant_node is None:
continue
variant_dict = {"variant_node":variant_node ,
"material_container": container} "material_container": container}
machine_variant_map[definition_id][variant_name] = variant_dict machine_variant_map[definition_id][variant_name] = variant_dict
continue continue