mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-14 18:27:51 -06:00
Mark definition_changes conflict if it is not found
CURA-4143
This commit is contained in:
parent
6fd3963e8f
commit
65554b60e1
1 changed files with 2 additions and 0 deletions
|
@ -225,6 +225,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
|
||||||
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
|
||||||
|
else:
|
||||||
|
definition_changes_conflict = True
|
||||||
elif container_type == "user":
|
elif container_type == "user":
|
||||||
num_user_settings += len(instance_container._instances)
|
num_user_settings += len(instance_container._instances)
|
||||||
elif container_type in self._ignored_instance_container_types:
|
elif container_type in self._ignored_instance_container_types:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue