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

_settingIsOverwritingInheritance now also checks if there is a non setting value before it

Browse source 
CURA-2361
This commit is contained in:
Jaime van Kessel 2016-09-16 14:25:44 +02:00
parent 4f547fff8d
commit 6d2520ffbb
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cura/Settings/SettingInheritanceManager.py
View file

@ -126,17 +126,22 @@ class SettingInheritanceManager(QObject):
while stack: while stack:
containers.extend(stack.getContainers()) containers.extend(stack.getContainers())
stack = stack.getNextStack() stack = stack.getNextStack()
has_non_function_value = False
for container in containers: for container in containers:
try: try:
has_setting_function = isinstance(container.getProperty(key, "value"), UM.Settings.SettingFunction) value = container.getProperty(key, "value")
if value is not None:
has_setting_function = isinstance(value, UM.Settings.SettingFunction)
if has_setting_function is False:
has_non_function_value = True
continue
except AttributeError: except AttributeError:
continue continue
if has_setting_function: if has_setting_function:
break # There is a setting function somehwere, stop looking deeper. break # There is a setting function somewhere, stop looking deeper.
## Also check if the top container is not a setting function (this happens if the inheritance is restored). ## Also check if the top container is not a setting function (this happens if the inheritance is restored).
return has_setting_function and not isinstance(self._active_container_stack.getTop().getProperty(key, "value"), UM.Settings.SettingFunction) return has_setting_function and not isinstance(self._active_container_stack.getTop().getProperty(key, "value"), UM.Settings.SettingFunction) and has_non_function_value
def _update(self): def _update(self):
self._settings_with_inheritance_warning = [] # Reset previous data. self._settings_with_inheritance_warning = [] # Reset previous data.