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

Mark definition_changes conflict if it is not found

Browse Source 
CURA-4143
This commit is contained in:
Lipu Fei 2017-08-09 13:06:13 +02:00
parent 6fd3963e8f
commit 65554b60e1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -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: