From 9a54ff426bc3b5d3ebf077cb5a3d90a00e653892 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 12 Jun 2017 15:14:25 +0200 Subject: [PATCH] FindAllQualitiesForMachineMaterial only looks with basic materials if it found them CURA-3911 --- cura/QualityManager.py | 3 ++- cura/Settings/MachineManager.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/QualityManager.py b/cura/QualityManager.py index f13181ef06..97cf2a356a 100644 --- a/cura/QualityManager.py +++ b/cura/QualityManager.py @@ -118,7 +118,8 @@ class QualityManager: result = self._getFilteredContainersForStack(machine_definition, [material_container], **criteria) if not result: 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 diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index a5b4deb1bb..33372a3228 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -759,7 +759,6 @@ class MachineManager(QObject): # Fall back to a quality (which must be compatible with all other extruders) new_qualities = quality_manager.findAllUsableQualitiesForMachineAndExtruders( self._global_container_stack, ExtruderManager.getInstance().getExtruderStacks()) - if new_qualities: new_quality_id = new_qualities[0].getId() # Just pick the first available one else: