Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent_per_quality

This commit is contained in:
Jaime van Kessel 2019-07-02 13:52:46 +02:00
commit be1fd2e003
10 changed files with 306 additions and 55 deletions

View file

@ -986,8 +986,9 @@ class MachineManager(QObject):
self._application.globalContainerStackChanged.emit()
self.forceUpdateAllSettings()
# Note that this function is deprecated, but the decorators for this don't play well together!
# @deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2")
@pyqtSlot(int, result = QObject)
@deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2")
def getExtruder(self, position: int) -> Optional[ExtruderStack]:
if self._global_container_stack:
return self._global_container_stack.extruders.get(str(position))