From 026244fb53cfe169f3b1c5903d8f75de32bdd934 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 15 Aug 2017 10:49:09 +0200 Subject: [PATCH] Add comments for conflict detection CURA-4143 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 9e69f3199b..3d4812a677 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -223,6 +223,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): num_settings_overriden_by_definition_changes += len(instance_container._instances) definition_changes = self._container_registry.findInstanceContainers(id = container_id) 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[0] != instance_container: definition_changes_conflict = True