From 615ec67b1b78a903053a9d5e67eb760cc3f550a0 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 16 Sep 2016 11:49:23 +0200
Subject: [PATCH] Enabled property is now taken into account for inheritance
 override

CURA-2361
---
 cura/Settings/SettingInheritanceManager.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py
index d7953498f2..90ff2e9c86 100644
--- a/cura/Settings/SettingInheritanceManager.py
+++ b/cura/Settings/SettingInheritanceManager.py
@@ -98,6 +98,10 @@ class SettingInheritanceManager(QObject):
         has_user_state = self._active_container_stack.getProperty(key, "state") == UM.Settings.InstanceState.User
         if not has_user_state:
             return False
+
+        if not self._active_container_stack.getProperty(key, "enabled"):
+            return False
+        
         while stack:
             containers.extend(stack.getContainers())
             stack = stack.getNextStack()