Prefer a read-only material in findDefaultMaterial.

Contributes to CURA-4243.
This commit is contained in:
Jack Ha 2017-12-05 09:51:57 +01:00
parent 41cde7c7f4
commit ce78bddfbb

View file

@ -487,11 +487,17 @@ class CuraContainerStack(ContainerStack):
search_criteria.pop("name", None) search_criteria.pop("name", None)
materials = ContainerRegistry.getInstance().findInstanceContainers(**search_criteria) materials = ContainerRegistry.getInstance().findInstanceContainers(**search_criteria)
if materials: if not materials:
return materials[0] Logger.log("w", "Could not find a valid material for stack {stack}", stack = self.id)
return None
for material in materials:
# Prefer a read-only material
if ContainerRegistry.getInstance().isReadOnly(material.getId()):
return material
return materials[0]
Logger.log("w", "Could not find a valid material for stack {stack}", stack = self.id)
return None
## Find the quality that should be used as "default" quality. ## Find the quality that should be used as "default" quality.
# #