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

Move the definition_changes fix to CuraContainerStack

Browse source 
CURA-5281
This commit is contained in:
Lipu Fei 2018-04-25 16:11:56 +02:00
parent 50e2db47c8
commit df1e15b1e5
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/CuraContainerStack.py
View file

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

7
cura/Settings/MachineManager.py
View file

@ -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")