Merge branch 'CURA-6873_fix_um2_crash' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2019-10-10 13:32:05 +02:00
commit ee25c4b94c
No known key found for this signature in database
GPG Key ID: 3710727397403C91

View File

@ -84,7 +84,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(