3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-07-13 09:49:20 +02:00
commit 936617f2aa
4 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/ExtruderManager.py
View file

@ -142,7 +142,7 @@ class ExtruderManager(QObject):
container_stack.addContainer(extruder_definition)
# Find the variant to use for this extruder.
variant = container_registry.getEmptyInstanceContainer()
variant = container_registry.findInstanceContainers(id = "empty_variant")[0]
if machine_definition.getMetaDataEntry("has_variants"):
# First add any variant. Later, overwrite with preference if the preference is valid.
variants = container_registry.findInstanceContainers(definition = machine_id, type = "variant")
@ -159,7 +159,7 @@ class ExtruderManager(QObject):
container_stack.addContainer(variant)
# Find a material to use for this variant.
material = container_registry.getEmptyInstanceContainer()
material = container_registry.findInstanceContainers(id = "empty_material")[0]
if machine_definition.getMetaDataEntry("has_materials"):
# First add any material. Later, overwrite with preference if the preference is valid.
if machine_definition.getMetaDataEntry("has_variant_materials", default = "False") == "True":