3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Jaime van Kessel 2017-05-12 16:57:12 +02:00
commit 05f2cd1680
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -426,8 +426,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if not user_containers:
containers_to_add.append(instance_container)
else:
instance_container = user_containers[0]
if self._resolve_strategies["machine"] == "override" or self._resolve_strategies["machine"] is None:
instance_container = user_containers[0]
instance_container.deserialize(archive.open(instance_container_file).read().decode("utf-8"))
instance_container.setDirty(True)
elif self._resolve_strategies["machine"] == "new":