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

Remove legacy if check in project loading

Browse source 
CURA-4617
This commit is contained in:
Lipu Fei 2017-11-27 14:27:11 +01:00
parent 49cac860a8
commit 33a06e13a9
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -715,11 +715,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
extruder_file_content = archive.open(extruder_stack_file, "r").read().decode("utf-8") extruder_file_content = archive.open(extruder_stack_file, "r").read().decode("utf-8")
if self._resolve_strategies["machine"] == "override": if self._resolve_strategies["machine"] == "override":
if global_stack.getProperty("machine_extruder_count", "value") > 1: # deserialize new extruder stack over the current ones (if any)
# deserialize new extruder stack over the current ones (if any) stack = self._overrideExtruderStack(global_stack, extruder_file_content, extruder_stack_file)
stack = self._overrideExtruderStack(global_stack, extruder_file_content, extruder_stack_file) if stack is None:
if stack is None: continue
continue
elif self._resolve_strategies["machine"] == "new": elif self._resolve_strategies["machine"] == "new":
new_id = extruder_stack_id_map[container_id] new_id = extruder_stack_id_map[container_id]