FindAllQualitiesForMachineMaterial only looks with basic materials if it found them

CURA-3911
This commit is contained in:
Jaime van Kessel 2017-06-12 15:14:25 +02:00
parent a306b4dada
commit 9a54ff426b
2 changed files with 2 additions and 2 deletions

View file

@ -118,7 +118,8 @@ class QualityManager:
result = self._getFilteredContainersForStack(machine_definition, [material_container], **criteria) result = self._getFilteredContainersForStack(machine_definition, [material_container], **criteria)
if not result: if not result:
basic_materials = self._getBasicMaterials(material_container) basic_materials = self._getBasicMaterials(material_container)
result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria) if basic_materials:
result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria)
return result return result

View file

@ -759,7 +759,6 @@ class MachineManager(QObject):
# Fall back to a quality (which must be compatible with all other extruders) # Fall back to a quality (which must be compatible with all other extruders)
new_qualities = quality_manager.findAllUsableQualitiesForMachineAndExtruders( new_qualities = quality_manager.findAllUsableQualitiesForMachineAndExtruders(
self._global_container_stack, ExtruderManager.getInstance().getExtruderStacks()) self._global_container_stack, ExtruderManager.getInstance().getExtruderStacks())
if new_qualities: if new_qualities:
new_quality_id = new_qualities[0].getId() # Just pick the first available one new_quality_id = new_qualities[0].getId() # Just pick the first available one
else: else: