3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch '2.7'

Browse source
This commit is contained in:
Lipu Fei 2017-08-09 16:59:56 +02:00
commit 0a76e5c38f
6 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -226,6 +226,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if definition_changes:
if definition_changes[0] != instance_container:
definition_changes_conflict = True
elif container_type == "quality":
if not quality_name:
quality_name = instance_container.getName()
elif container_type == "user":
num_user_settings += len(instance_container._instances)
elif container_type in self._ignored_instance_container_types: