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

InheritanceManager now checks if a setting function can actually change before labeling it

Browse source 
CURA-2860
This commit is contained in:
Jaime van Kessel 2016-11-04 15:59:01 +01:00
parent ed5244bcb0
commit 867463f718
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Settings/SettingInheritanceManager.py
View file

@ -163,13 +163,15 @@ class SettingInheritanceManager(QObject):
for container in containers: for container in containers:
try: try:
value = container.getProperty(key, "value") value = container.getProperty(key, "value")
except AttributeError:
continue
if value is not None: if value is not None:
has_setting_function = isinstance(value, UM.Settings.SettingFunction) # If a setting doesn't use any keys, it won't change it's value, so treat it as if it's a fixed value
has_setting_function = isinstance(value, UM.Settings.SettingFunction) and len(value.getUsedSettingKeys()) > 0
if has_setting_function is False: if has_setting_function is False:
has_non_function_value = True has_non_function_value = True
continue continue
except AttributeError:
continue
if has_setting_function: if has_setting_function:
break # There is a setting function somewhere, stop looking deeper. break # There is a setting function somewhere, stop looking deeper.
return has_setting_function and has_non_function_value return has_setting_function and has_non_function_value