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

Mark definition changes container found instead of conflict

Browse Source 
CURA-4143

Reverts 65554b60e19507635c79048dc73862e6b25ec0ec
This commit is contained in:
Lipu Fei 2017-08-09 13:11:37 +02:00
parent 65554b60e1
commit ccabbd8ca0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -222,11 +222,10 @@ 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
else:
definition_changes_conflict = True
elif container_type == "user":
num_user_settings += len(instance_container._instances)
elif container_type in self._ignored_instance_container_types: