Moved loading of meshdata in workspace to after machine has changed

This fixes the issue where the location of the objects was not correct.
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-30 12:57:10 +01:00
parent dcdfe612e7
commit 61db5b42b7

View file

@ -128,11 +128,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
return WorkspaceReader.PreReadResult.accepted
def read(self, file_name):
# Load all the nodes / meshdata of the workspace
nodes = self._3mf_mesh_reader.read(file_name)
if nodes is None:
nodes = []
archive = zipfile.ZipFile(file_name, "r")
cura_file_names = [name for name in archive.namelist() if name.startswith("Cura/")]
@ -399,6 +394,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# Actually change the active machine.
Application.getInstance().setGlobalContainerStack(global_stack)
# Load all the nodes / meshdata of the workspace
nodes = self._3mf_mesh_reader.read(file_name)
if nodes is None:
nodes = []
return nodes
def _stripFileToId(self, file):