GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 05:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enabled property is now taken into account for inheritance override

Browse Source 
CURA-2361
This commit is contained in:
Jaime van Kessel 2016-09-16 11:49:23 +02:00
parent 9a7057ce65
commit 615ec67b1b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/SettingInheritanceManager.py
View File

@ -98,6 +98,10 @@ class SettingInheritanceManager(QObject):
has_user_state = self._active_container_stack.getProperty(key, "state") == UM.Settings.InstanceState.User has_user_state = self._active_container_stack.getProperty(key, "state") == UM.Settings.InstanceState.User
if not has_user_state: if not has_user_state:
return False return False
if not self._active_container_stack.getProperty(key, "enabled"):
return False
while stack: while stack:
containers.extend(stack.getContainers()) containers.extend(stack.getContainers())
stack = stack.getNextStack() stack = stack.getNextStack()