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

Fix check for has_variants & has_materials

Browse source 
These are defined as bool values instead of strings in UM2+ definitions, so I would expect other machine definitions (including jedi) also use bools.

CURA-333
This commit is contained in:
fieldOfView 2016-06-16 10:41:50 +02:00
parent 631ab9c0a1
commit 7f093be75a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/ExtruderManager.py
View file

@ -138,7 +138,7 @@ class ExtruderManager(QObject):
#Find the variant to use for this extruder. #Find the variant to use for this extruder.
variant = container_registry.getEmptyInstanceContainer() variant = container_registry.getEmptyInstanceContainer()
if machine_definition.getMetaDataEntry("has_variants", default = "False") == "True": if machine_definition.getMetaDataEntry("has_variants"):
#First add any variant. Later, overwrite with preference if the preference is valid. #First add any variant. Later, overwrite with preference if the preference is valid.
variants = container_registry.findInstanceContainers(machine = machine_id, type = "variant") variants = container_registry.findInstanceContainers(machine = machine_id, type = "variant")
if len(variants) >= 1: if len(variants) >= 1:
@ -155,7 +155,7 @@ class ExtruderManager(QObject):
#Find a material to use for this variant. #Find a material to use for this variant.
material = container_registry.getEmptyInstanceContainer() material = container_registry.getEmptyInstanceContainer()
if machine_definition.getMetaDataEntry("has_materials", default = "False") == "True": if machine_definition.getMetaDataEntry("has_materials"):
#First add any material. Later, overwrite with preference if the preference is valid. #First add any material. Later, overwrite with preference if the preference is valid.
if machine_definition.getMetaDataEntry("has_variant_materials", default = "False") == "True": if machine_definition.getMetaDataEntry("has_variant_materials", default = "False") == "True":
materials = container_registry.findInstanceContainers(type = "material", machine = machine_id, variant = variant.getId()) materials = container_registry.findInstanceContainers(type = "material", machine = machine_id, variant = variant.getId())