GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-01 17:31:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2017-05-10 09:50:02 +02:00
commit 82d38490c4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -67,7 +67,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# separate container stack files and extruder stack files # separate container stack files and extruder stack files
files_to_determine = [name for name in file_list if name.endswith(self._container_stack_suffix)] files_to_determine = [name for name in file_list if name.endswith(self._container_stack_suffix)]
for file_name in files_to_determine: for file_name in files_to_determine:
container_id = self._stripFileToId(file_name)
# FIXME: HACK! # FIXME: HACK!
# We need to know the type of the stack file, but we can only know it if we deserialize it. # We need to know the type of the stack file, but we can only know it if we deserialize it.
# The default ContainerStack.deserialize() will connect signals, which is not desired in this case. # The default ContainerStack.deserialize() will connect signals, which is not desired in this case.
@ -398,7 +397,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
pass pass
quality_changes_instance_containers.append(instance_container) quality_changes_instance_containers.append(instance_container)
else: else:
continue existing_container = self._container_registry.findInstanceContainers(id = container_id)
if not existing_container:
containers_to_add.append(instance_container)
# Add all the containers right before we try to add / serialize the stack # Add all the containers right before we try to add / serialize the stack
for container in containers_to_add: for container in containers_to_add: