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

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

Browse Source
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
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

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