3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '3.5' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2018-09-13 16:23:55 +02:00
commit 757c8754b1
25 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/Settings/ExtruderManager.py
View file

@ -314,11 +314,11 @@ class ExtruderManager(QObject):
if not global_stack:
return []
result = list(global_stack.extruders.values())
result_tuple_list = sorted(list(global_stack.extruders.items()), key = lambda x: int(x[0]))
result_list = [item[1] for item in result_tuple_list]
machine_extruder_count = global_stack.getProperty("machine_extruder_count", "value")
return result[:machine_extruder_count]
return result_list[:machine_extruder_count]
def _globalContainerStackChanged(self) -> None:
# If the global container changed, the machine changed and might have extruders that were not registered yet