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

Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness

Browse source
This commit is contained in:
Lipu Fei 2019-10-14 12:23:49 +02:00
commit 8b913f4009
31 changed files with 103 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/VariantNode.py
View file

@ -83,7 +83,7 @@ class VariantNode(ContainerNode):
return material_node
# First fallback: Choose any material with matching diameter.
for material_node in self.materials.values():
if approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")):
if material_node.getMetaDataEntry("approximate_diameter") and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")):
return material_node
fallback = next(iter(self.materials.values())) # Should only happen with empty material node.
Logger.log("w", "Could not find preferred material {preferred_material} with diameter {diameter} for variant {variant_id}, falling back to {fallback}.".format(