Merge branch '3.0'

This commit is contained in:
Ghostkeeper 2017-09-28 09:17:55 +02:00
commit 3fa281084f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
19 changed files with 1450 additions and 1683 deletions

View file

@ -112,7 +112,13 @@ class MachineSettingsAction(MachineAction):
if not self._global_container_stack:
return 0
return len(self._global_container_stack.getMetaDataEntry("machine_extruder_trains"))
# If there is a printer that originally is multi-extruder, it's not allowed to change the number of extruders
# It's just allowed in case of Custom FDM printers
definition_container = self._global_container_stack.getBottom()
if definition_container.getId() == "custom":
return len(self._global_container_stack.getMetaDataEntry("machine_extruder_trains"))
return 0
@pyqtSlot(int)
def setMachineExtruderCount(self, extruder_count):