Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2020-08-14 14:57:09 +0300
committerJaime van Kessel <nallath@gmail.com>2020-08-14 14:57:09 +0300
commit4c00a8ff2cb8ea2bae15bd9246ac96870c8478a8 (patch)
treea20d905adf94be21ddcc313441013021084fe0b3
parent9a0264644b870b96720e98318f0702ffcc5b31d4 (diff)
Add extra short-circuit for resolve
-rwxr-xr-xcura/Settings/GlobalStack.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py
index a254104c5b..4528fd2302 100755
--- a/cura/Settings/GlobalStack.py
+++ b/cura/Settings/GlobalStack.py
@@ -263,6 +263,10 @@ class GlobalStack(CuraContainerStack):
# Do not try to resolve anything but the "value" property
return False
+ if not self.definition.getProperty(key, "resolve"):
+ # If there isn't a resolve set for this setting, there isn't anything to do here.
+ return False
+
current_thread = threading.current_thread()
if key in self._resolving_settings[current_thread.name]:
# To prevent infinite recursion, if getProperty is called with the same key as