mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 07:27:29 -06:00
Fixed resolvement not being overwritten by user changes
This commit is contained in:
parent
9d6c60ec60
commit
a68e112060
1 changed files with 8 additions and 1 deletions
|
@ -206,7 +206,14 @@ class StartSliceJob(Job):
|
||||||
# Use resolvement value if available, or take the value
|
# Use resolvement value if available, or take the value
|
||||||
resolved_value = stack.getProperty(key, "resolve")
|
resolved_value = stack.getProperty(key, "resolve")
|
||||||
if resolved_value is not None:
|
if resolved_value is not None:
|
||||||
settings[key] = resolved_value
|
# There is a resolvement value. Check if we need to use it.
|
||||||
|
user_container = stack.findContainer({"type": "user"})
|
||||||
|
quality_changes_container = stack.findContainer({"type": "quality_changes"})
|
||||||
|
if user_container.hasProperty(key,"value") or quality_changes_container.hasProperty(key,"value"):
|
||||||
|
# Normal case
|
||||||
|
settings[key] = stack.getProperty(key, "value")
|
||||||
|
else:
|
||||||
|
settings[key] = resolved_value
|
||||||
else:
|
else:
|
||||||
# Normal case
|
# Normal case
|
||||||
settings[key] = stack.getProperty(key, "value")
|
settings[key] = stack.getProperty(key, "value")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue