diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2021-12-14 13:48:58 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2021-12-14 13:48:58 +0300 |
| commit | 9140b71b1998d75d51ae556bbb63059de6016c9c (patch) | |
| tree | 6bc49869a84820770d325d5c0300ed9f1e42bdec /plugins/3MFReader | |
| parent | 64dec9ecc10eb81b68aecc4dcf586e80c03dec01 (diff) | |
| parent | 2000f8143a1392ea1d198b485ba17e84dba33594 (diff) | |
Merge branch 'libArachne_rebased'
Conflicts:
plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
resources/definitions -> Bunch of conflicts with profile updates.
resources/quality -> Bunch of conflicts with profile updates.
resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
Diffstat (limited to 'plugins/3MFReader')
| -rwxr-xr-x | plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 0578fd51c3..5f57e49cc6 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -379,7 +379,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # - the global stack DOESN'T exist but some/all of the extruder stacks exist # To simplify this, only check if the global stack exists or not global_stack_id = self._stripFileToId(global_stack_file) + serialized = archive.open(global_stack_file).read().decode("utf-8") + serialized = GlobalStack._updateSerialized(serialized, global_stack_file) machine_name = self._getMachineNameFromSerializedStack(serialized) self._machine_info.metadata_dict = self._getMetaDataDictFromSerializedStack(serialized) |