3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 11:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fixed accidental switch of function properties

Browse source
This commit is contained in:
Jaime van Kessel 2017-04-14 14:15:43 +02:00
parent 16a3f10e1e
commit 09d624dcfe
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/Settings/MachineManager.py
View file

@ -329,6 +329,7 @@ class MachineManager(QObject):
name = self._createUniqueName("machine", "", name, definition.getName()) name = self._createUniqueName("machine", "", name, definition.getName())
new_global_stack = ContainerStack(name) new_global_stack = ContainerStack(name)
new_global_stack.addMetaDataEntry("type", "machine") new_global_stack.addMetaDataEntry("type", "machine")
new_global_stack.addContainer(definition)
container_registry.addContainer(new_global_stack) container_registry.addContainer(new_global_stack)
variant_instance_container = self._updateVariantContainer(definition) variant_instance_container = self._updateVariantContainer(definition)
@ -341,7 +342,7 @@ class MachineManager(QObject):
current_settings_instance_container.setDefinition(definitions[0]) current_settings_instance_container.setDefinition(definitions[0])
container_registry.addContainer(current_settings_instance_container) container_registry.addContainer(current_settings_instance_container)
new_global_stack.addContainer(definition)
if variant_instance_container: if variant_instance_container:
new_global_stack.addContainer(variant_instance_container) new_global_stack.addContainer(variant_instance_container)
if material_instance_container: if material_instance_container:
@ -1110,7 +1111,7 @@ class MachineManager(QObject):
return self._empty_variant_container return self._empty_variant_container
def _updateMaterialContainer(self, stack, definition, variant_container = None, preferred_material_name = None): def _updateMaterialContainer(self, definition, stack, variant_container = None, preferred_material_name = None):
if not definition.getMetaDataEntry("has_materials"): if not definition.getMetaDataEntry("has_materials"):
return self._empty_material_container return self._empty_material_container