Fixed resolvement not being overwritten by user changes

plugins/CuraEngineBackend/StartSliceJob.py

@@ -206,7 +206,14 @@ class StartSliceJob(Job):
             # Use resolvement value if available, or take the value
             resolved_value = stack.getProperty(key, "resolve")
             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:
                 # Normal case
                 settings[key] = stack.getProperty(key, "value")