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

Merge from master

Browse source
This commit is contained in:
Lipu Fei 2018-10-23 08:08:31 +02:00
commit cbd8c8739d
6 changed files with 12874 additions and 12869 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/MachineManager.py
View file

@ -201,7 +201,9 @@ class MachineManager(QObject):
extruder_configuration.hotendID = extruder.variant.getName() if extruder.variant != empty_variant_container else None
self._current_printer_configuration.extruderConfigurations.append(extruder_configuration)
self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value") if self._global_container_stack.variant != empty_variant_container else None
# an empty build plate configuration from the network printer is presented as an empty string, so use "" for an
# empty build plate.
self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value") if self._global_container_stack.variant != empty_variant_container else ""
self.currentConfigurationChanged.emit()
@pyqtSlot(QObject, result = bool)