Merge branch 'CURA-7549_Project_file_enables_support_in_4.6_but_not_in_4.7' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2020-07-07 11:05:57 +02:00
commit 9228cb7d0c
No known key found for this signature in database
GPG key ID: 3710727397403C91

View file

@ -471,7 +471,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
extruder_info.intent_info = instance_container_info_dict[intent_id]
if not machine_conflict and containers_found_dict["machine"]:
if int(position) >= len(global_stack.extrurderList):
if int(position) >= len(global_stack.extruderList):
continue
existing_extruder_stack = global_stack.extruderList[int(position)]
@ -822,7 +822,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
try:
extruder_stack = global_stack.extruderList[int(position)]
except IndexError:
pass
continue
intent_category = quality_changes_intent_category_per_extruder[position]
container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack)
container_info.container = container
@ -887,7 +887,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
try:
extruder_stack = global_stack.extruderList[int(position)]
except IndexError:
extruder_stack = None
continue
intent_category = quality_changes_intent_category_per_extruder[position]
container = self._createNewQualityChanges(quality_changes_quality_type, intent_category, quality_changes_name, global_stack, extruder_stack)
container_info.container = container