From ef2aa3b2b212b48ca75df9da6c9bd7f139a83fd4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 12 May 2017 13:59:31 +0200 Subject: [PATCH] Empty InstanceContainers are now correctly handled by setActiveMaterial again CURA-3789 --- cura/Settings/MachineManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 9d66bc7030..0837c577a5 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -721,7 +721,7 @@ class MachineManager(QObject): Logger.log("w", "While trying to set the active material, no material was found to replace it.") return - if old_quality_changes and old_quality_changes.getId() == "empty_quality_changes": + if old_quality_changes and isinstance(old_quality_changes, type(self._empty_quality_changes_container)): old_quality_changes = None self.blurSettings.emit() @@ -754,7 +754,7 @@ class MachineManager(QObject): candidate_quality = quality_manager.findQualityByQualityType(quality_type, quality_manager.getWholeMachineDefinition(machine_definition), [material_container]) - if not candidate_quality or candidate_quality.getId() == "empty_quality": + if not candidate_quality or isinstance(candidate_quality, type(self._empty_quality_changes_container)): # 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())