From 471182333d218190c99c42427d29e82fd12b06c6 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Wed, 21 Feb 2018 10:41:39 +0100 Subject: [PATCH] CURA-4606 refactored activeMaterialNames --- cura/Settings/MachineManager.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ec024f7b49..e34b1a0763 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -460,15 +460,7 @@ class MachineManager(QObject): @pyqtProperty("QVariantList", notify = activeMaterialChanged) def activeMaterialNames(self) -> List[str]: - result = [] - - active_stacks = ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks() - if active_stacks is not None: - for stack in active_stacks: - material_container = stack.material - if material_container and material_container != self._empty_material_container: - result.append(material_container.getName()) - return result + return list(self._current_root_material_name.values()) @pyqtProperty(str, notify=activeMaterialChanged) def activeMaterialId(self) -> str: