From 65554b60e19507635c79048dc73862e6b25ec0ec Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 9 Aug 2017 13:06:13 +0200 Subject: [PATCH] Mark definition_changes conflict if it is not found CURA-4143 --- plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 278e3030ec..af314858a1 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -225,6 +225,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): 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: