From 54698ada7f6563d3b0c5b22b1d80e604e8848212 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 16 Jan 2018 15:36:57 +0100 Subject: [PATCH] CURA-4807 fix not choosing 'not supported' if there are valid options after changing variant; partly undoing 4abbd4b9887fc3e3d98ebf06481d2b21a9e9be0e --- cura/QualityManager.py | 3 --- cura/Settings/ProfilesModel.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cura/QualityManager.py b/cura/QualityManager.py index d984bd17a1..76a0c86a5f 100644 --- a/cura/QualityManager.py +++ b/cura/QualityManager.py @@ -136,9 +136,6 @@ class QualityManager: if basic_materials: result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria) - empty_quality = ContainerRegistry.getInstance().findInstanceContainers(id = "empty_quality")[0] - result.append(empty_quality) - return result ## Find all quality changes for a machine. diff --git a/cura/Settings/ProfilesModel.py b/cura/Settings/ProfilesModel.py index 15b123d12f..77cd407457 100644 --- a/cura/Settings/ProfilesModel.py +++ b/cura/Settings/ProfilesModel.py @@ -87,7 +87,7 @@ class ProfilesModel(InstanceContainersModel): if quality.getMetaDataEntry("quality_type") not in quality_type_set: result.append(quality) - if len(result) > 1: + if len(result) > 1 and self._empty_quality in result: result.remove(self._empty_quality) return {item.getId(): item for item in result}, {} #Only return true profiles for now, no metadata. The quality manager is not able to get only metadata yet.