From 5e43e723e7b9dcfc849f2c2454ebf61b7a2070a5 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 7 May 2019 14:27:32 +0200 Subject: [PATCH] Fix activeMaterialsCompatible() CURA-6511 Looks like a merge conflict --- 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 cd6c7cd191..ed797882b6 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1263,8 +1263,8 @@ class MachineManager(QObject): if self._global_container_stack is not None: if Util.parseBool(self._global_container_stack.getMetaDataEntry("has_materials", False)): for position, extruder in self._global_container_stack.extruders.items(): - if extruder.isEnabled and not extruder.material.getMetaDataEntry("compatible"): - return False + if not extruder.isEnabled: + continue if not extruder.material.getMetaDataEntry("compatible"): return False return True