3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve now also returns value if resolve was undefined

Browse source 
CURA-2319
This commit is contained in:
Jaime van Kessel 2016-09-21 15:01:08 +02:00
parent c13003c960
commit 6c7a0d73c3
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingTextField.qml
View file

@ -114,7 +114,7 @@ SettingItem
// 3: material -> user changed material in materialspage // 3: material -> user changed material in materialspage
// 4: variant // 4: variant
// 5: machine // 5: machine
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) { if ((propertyProvider.properties.resolve != "None" && propertyProvider.properties.resolve) && (stackLevel != 0) && (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).