From ccabbd8ca0215ad220d7610fc37668a85d78c12c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Aug 2017 13:11:37 +0200 Subject: [PATCH] Mark definition changes container found instead of conflict CURA-4143 Reverts 65554b60e19507635c79048dc73862e6b25ec0ec --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index af314858a1..9b390cb636 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -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: