3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 21:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Simplify the _shouldResolve function

Browse source 
This increases the speed of the setting resolvement.
This commit is contained in:
Jaime van Kessel 2020-08-14 13:41:20 +02:00
parent 1374c2faa9
commit 9a0264644b
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Settings/GlobalStack.py
View file

@ -256,8 +256,6 @@ class GlobalStack(CuraContainerStack):
raise Exceptions.InvalidOperationError("Global stack cannot have a next stack!")
# protected:
# Determine whether or not we should try to get the "resolve" property instead of the
# requested property.
def _shouldResolve(self, key: str, property_name: str, context: Optional[PropertyEvaluationContext] = None) -> bool:
@ -273,10 +271,8 @@ class GlobalStack(CuraContainerStack):
# track all settings that are being resolved.
return False
setting_state = super().getProperty(key, "state", context = context)
if setting_state is not None and setting_state != InstanceState.Default:
# When the user has explicitly set a value, we should ignore any resolve and
# just return that value.
if self.hasUserValue(key):
# When the user has explicitly set a value, we should ignore any resolve and just return that value.
return False
return True