Merge branch '3.1'

This commit is contained in:
Ghostkeeper 2017-11-22 17:13:16 +01:00
commit f3da1a25fc
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
5 changed files with 24 additions and 8 deletions

View file

@ -746,7 +746,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# If not extruder stacks were saved in the project file (pre 3.1) create one manually
# We re-use the container registry's addExtruderStackForSingleExtrusionMachine method for this
if not extruder_stacks:
self._container_registry.addExtruderStackForSingleExtrusionMachine(global_stack, "fdmextruder")
extruder_stacks.append(self._container_registry.addExtruderStackForSingleExtrusionMachine(global_stack, "fdmextruder"))
except:
Logger.logException("w", "We failed to serialize the stack. Trying to clean up.")