3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Mark definition changes container found instead of conflict

Browse source 
CURA-4143

Reverts 65554b60e1
This commit is contained in:
Lipu Fei 2017-08-09 13:11:37 +02:00
parent 65554b60e1
commit ccabbd8ca0
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -222,11 +222,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
definition_name = instance_container.getName() definition_name = instance_container.getName()
num_settings_overriden_by_definition_changes += len(instance_container._instances) num_settings_overriden_by_definition_changes += len(instance_container._instances)
definition_changes = self._container_registry.findDefinitionContainers(id = container_id) definition_changes = self._container_registry.findDefinitionContainers(id = container_id)
containers_found_dict["definition_changes"] = True
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: