|
@@ -31,7 +31,6 @@ class GlobalStack(CuraContainerStack):
|
|
# and if so, to bypass the resolve to prevent an infinite recursion that would occur
|
|
# and if so, to bypass the resolve to prevent an infinite recursion that would occur
|
|
# if the resolve function tried to access the same property it is a resolve for.
|
|
# if the resolve function tried to access the same property it is a resolve for.
|
|
self._resolving_settings = set()
|
|
self._resolving_settings = set()
|
|
- self._resolving_settings2 = [] # For debugging CURA-4848, if it happens
|
|
|
|
|
|
|
|
## Get the list of extruders of this stack.
|
|
## Get the list of extruders of this stack.
|
|
#
|
|
#
|
|
@@ -92,17 +91,16 @@ class GlobalStack(CuraContainerStack):
|
|
|
|
|
|
# Handle the "resolve" property.
|
|
# Handle the "resolve" property.
|
|
if self._shouldResolve(key, property_name, context):
|
|
if self._shouldResolve(key, property_name, context):
|
|
- self._resolving_settings2.append(key)
|
|
|
|
self._resolving_settings.add(key)
|
|
self._resolving_settings.add(key)
|
|
resolve = super().getProperty(key, "resolve", context)
|
|
resolve = super().getProperty(key, "resolve", context)
|
|
if key not in self._resolving_settings:
|
|
if key not in self._resolving_settings:
|
|
- Logger.log("e", "Key [%s] should really have been in set(%s) and [%s]. Now I'm gonna crash", key, str(self._resolving_settings), str(self._resolving_settings2))
|
|
|
|
|
|
+ # For debugging CURA-4848, if it happens
|
|
|
|
+ Logger.log("e", "Key [%s] should really have been in set(%s). Now I'm gonna crash", key, str(self._resolving_settings))
|
|
Logger.log("d", "------ context ------")
|
|
Logger.log("d", "------ context ------")
|
|
for stack in context.stack_of_containers:
|
|
for stack in context.stack_of_containers:
|
|
Logger.log("d", "Context: %s", stack.getId())
|
|
Logger.log("d", "Context: %s", stack.getId())
|
|
Logger.log("d", "------ context end ------")
|
|
Logger.log("d", "------ context end ------")
|
|
self._resolving_settings.remove(key)
|
|
self._resolving_settings.remove(key)
|
|
- self._resolving_settings2.pop()
|
|
|
|
if resolve is not None:
|
|
if resolve is not None:
|
|
return resolve
|
|
return resolve
|
|
|
|
|