Do not use resolve for profile display when source is quality changes

Fixes CURA-3115
This commit is contained in:
Arjen Hiemstra 2016-12-15 15:36:38 +01:00
parent 4bee3b6fdc
commit f04dc88d2c

View file

@ -193,6 +193,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
profile_value_source = "" profile_value_source = ""
for container in containers: for container in containers:
new_value = container.getProperty(definition.key, "value") new_value = container.getProperty(definition.key, "value")
if new_value is not None: if new_value is not None:
profile_value_source = container.getMetaDataEntry("type") profile_value_source = container.getMetaDataEntry("type")
profile_value = new_value profile_value = new_value
@ -200,7 +201,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
# Global tab should use resolve (if there is one) # Global tab should use resolve (if there is one)
if not self._extruder_id: if not self._extruder_id:
resolve_value = global_container_stack.getProperty(definition.key, "resolve") resolve_value = global_container_stack.getProperty(definition.key, "resolve")
if resolve_value is not None and profile_value is not None: if resolve_value is not None and profile_value is not None and profile_value_source != "quality_changes":
profile_value = resolve_value profile_value = resolve_value
user_value = None user_value = None