3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "Fix duplicating SettingOverrideDecorator settings"

Browse source 
This reverts commit 977eb8c94d.

This has been fixed in a different way in c7a3d33411
This commit is contained in:
fieldOfView 2018-03-27 08:32:13 +02:00
parent 3ebc90337c
commit caf700750c
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/CuraContainerStack.py
View file

@ -228,7 +228,7 @@ class CuraContainerStack(ContainerStack):
#
# \throws Exception.InvalidContainerError Raised when trying to replace a container with a container that has an incorrect type.
@override(ContainerStack)
def replaceContainer(self, index: int, container: ContainerInterface, postpone_emit: bool = False, force_replace: bool = False) -> None:
def replaceContainer(self, index: int, container: ContainerInterface, postpone_emit: bool = False) -> None:
expected_type = _ContainerIndexes.IndexTypeMap[index]
if expected_type == "definition":
if not isinstance(container, DefinitionContainer):
@ -237,7 +237,7 @@ class CuraContainerStack(ContainerStack):
raise Exceptions.InvalidContainerError("Cannot replace container at index {index} with a container that is not of {type} type, but {actual_type} type.".format(index = index, type = expected_type, actual_type = container.getMetaDataEntry("type")))
current_container = self._containers[index]
if current_container.getId() == container.getId() and not force_replace:
if current_container.getId() == container.getId():
return
super().replaceContainer(index, container, postpone_emit)

3
cura/Settings/SettingOverrideDecorator.py
View file

@ -56,8 +56,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
instance_container = copy.deepcopy(self._stack.getContainer(0), memo)
## Set the copied instance as the first (and only) instance container of the stack.
# Force replacing the container even though the id of the created deepcopy is the same
deep_copy._stack.replaceContainer(0, instance_container, force_replace = True)
deep_copy._stack.replaceContainer(0, instance_container)
# Properly set the right extruder on the copy
deep_copy.setActiveExtruder(self._extruder_stack)