3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
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
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()