GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-16 02:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1640 from Ultimaker/bugfix_CURA-3421_per_model_combobox

Browse Source 
CURA-3421 Set SettingsComboBox value if we get undefined from resolve
This commit is contained in:
jack 2017-04-04 10:57:42 +02:00 committed by GitHub
commit 0ad344f91d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/Settings/SettingComboBox.qml
View File

@ -95,13 +95,17 @@ SettingItem
value: value:
{ {
// FIXME this needs to go away once 'resolve' is combined with 'value' in our data model. // FIXME this needs to go away once 'resolve' is combined with 'value' in our data model.
var value; var value = undefined;
if ((base.resolve != "None") && (base.stackLevel != 0) && (base.stackLevel != 1)) { if ((base.resolve != "None") && (base.stackLevel != 0) && (base.stackLevel != 1))
{
// We have a resolve function. Indicates that the setting is not settable per extruder and that // We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value // we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this). // (if user has explicitly set this).
value = base.resolve; value = base.resolve;
} else { }
if (value == undefined)
{
value = propertyProvider.properties.value; value = propertyProvider.properties.value;
} }