3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix 3MF-workspace-reading: Variants where not loaded properly.

Browse source 
part of CURA-6600
This commit is contained in:
Remco Burema 2019-09-13 12:59:54 +02:00
parent bca68c6db0
commit ef0f5988a2
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -942,7 +942,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
extruder_info = self._machine_info.extruder_info_dict[position] extruder_info = self._machine_info.extruder_info_dict[position]
if extruder_info.variant_info is None: if extruder_info.variant_info is None:
# If there is no variant_info, try to use the default variant. Otherwise, leave it be. # If there is no variant_info, try to use the default variant. Otherwise, leave it be.
node = variant_manager.getDefaultVariantNode(global_stack.definition, VariantType.NOZZLE, global_stack) machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()]
node = machine_node.variants[machine_node.preferred_variant_name]
if node is not None and node.container is not None: if node is not None and node.container is not None:
extruder_stack.variant = node.container extruder_stack.variant = node.container
continue continue
@ -951,7 +952,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
variant_name = parser["general"]["name"] variant_name = parser["general"]["name"]
variant_type = VariantType.NOZZLE variant_type = VariantType.NOZZLE
node = variant_manager.getVariantNode(global_stack.definition.getId(), variant_name, variant_type) node = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[variant_name]
if node is not None and node.container is not None: if node is not None and node.container is not None:
extruder_stack.variant = node.container extruder_stack.variant = node.container