From 608e62e081124e638fe63e284a8754641aea427d Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Thu, 6 Apr 2017 02:22:45 +0200 Subject: [PATCH] Do not try to get resolve when extruder count == 1 or for nonexistant properties --- cura/Settings/GlobalStack.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 763802c18c..806c37040f 100644 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -39,12 +39,13 @@ class GlobalStack(CuraContainerStack): ## Overridden from ContainerStack @override(ContainerStack) def getProperty(self, key: str, property_name: str) -> Any: - if property_name == "value" and not self._resolving_property: - if not self.hasUserValue(key): + if not self.definition.findDefinitions(key = key): + return None + + if property_name == "value" and self._resolving_property != key: + if not self.hasUserValue(key) and len(self._extruders) > 1: self._resolving_property = key resolve = super().getProperty(key, "resolve") - if resolve: - return resolve return super().getProperty(key, property_name)