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

Add comments for conflict detection

Browse Source 
CURA-4143
This commit is contained in:
Lipu Fei 2017-08-15 10:49:09 +02:00
parent 9ff6ae010a
commit 026244fb53
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -223,6 +223,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
num_settings_overriden_by_definition_changes += len(instance_container._instances) num_settings_overriden_by_definition_changes += len(instance_container._instances)
definition_changes = self._container_registry.findInstanceContainers(id = container_id) definition_changes = self._container_registry.findInstanceContainers(id = container_id)
containers_found_dict["definition_changes"] = True containers_found_dict["definition_changes"] = True
# Check if there is any difference the loaded settings from the project file and the settings in Cura.
if definition_changes: if definition_changes:
if definition_changes[0] != instance_container: if definition_changes[0] != instance_container:
definition_changes_conflict = True definition_changes_conflict = True