diff options
author | Lipu Fei <lipu.fei815@gmail.com> | 2018-04-25 17:11:56 +0300 |
---|---|---|
committer | Lipu Fei <lipu.fei815@gmail.com> | 2018-04-25 17:12:47 +0300 |
commit | df1e15b1e51fd7b4af4da84b52b7b35542175ea4 (patch) | |
tree | d1641659eb50f18f640ca9872341ef844a339d4a | |
parent | 50e2db47c8a729fb990c6c960df6463eb43b309a (diff) |
Move the definition_changes fix to CuraContainerStack3.3.1
CURA-5281
-rwxr-xr-x | cura/Settings/CuraContainerStack.py | 7 | ||||
-rwxr-xr-x | cura/Settings/MachineManager.py | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index ca4f866598..308a91bc76 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -283,6 +283,13 @@ class CuraContainerStack(ContainerStack): self._containers = new_containers + # CURA-5281 + # Some stacks can have empty definition_changes containers which will cause problems. + # Make sure that all stacks here have non-empty definition_changes containers. + if isinstance(new_containers[_ContainerIndexes.DefinitionChanges], type(self._empty_instance_container)): + from cura.Settings.CuraStackBuilder import CuraStackBuilder + CuraStackBuilder.createDefinitionChangesContainer(self, self.getId() + "_settings") + ## protected: # Helper to make sure we emit a PyQt signal on container changes. diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 9651fe190d..aabf36b60e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -302,13 +302,6 @@ class MachineManager(QObject): ## Given a global_stack, make sure that it's all valid by searching for this quality group and applying it again def _initMachineState(self, global_stack): - # Some stacks can have empty definition_changes containers which will cause problems. - # Make sure that all stacks here have non-empty definition_changes containers. - for stack in [global_stack] + list(global_stack.extruders.values()): - if isinstance(stack.definitionChanges, type(self._empty_container)): - from cura.Settings.CuraStackBuilder import CuraStackBuilder - CuraStackBuilder.createDefinitionChangesContainer(stack, stack.getId() + "_settings") - material_dict = {} for position, extruder in global_stack.extruders.items(): material_dict[position] = extruder.material.getMetaDataEntry("base_file") |