Merge branch 'master' into refactor_singleton_settingsbase

This commit is contained in:
Ghostkeeper 2018-09-13 11:52:13 +02:00
commit cc77632357
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
151 changed files with 62703 additions and 2111 deletions

View file

@ -342,7 +342,7 @@ class CuraEngineBackend(QObject, Backend):
if not self._global_container_stack:
Logger.log("w", "Global container stack not assigned to CuraEngineBackend!")
return
extruders = list(ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId()))
extruders = ExtruderManager.getInstance().getActiveExtruderStacks()
error_keys = [] #type: List[str]
for extruder in extruders:
error_keys.extend(extruder.getErrorKeys())