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

Merge branch '2.7'

Browse source
This commit is contained in:
Lipu Fei 2017-08-09 13:16:43 +02:00
commit 98b72fb971
28 changed files with 6 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -222,6 +222,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
definition_name = instance_container.getName()
num_settings_overriden_by_definition_changes += len(instance_container._instances)
definition_changes = self._container_registry.findDefinitionContainers(id = container_id)
containers_found_dict["definition_changes"] = True
if definition_changes:
if definition_changes[0] != instance_container:
definition_changes_conflict = True