3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge, fix qml files. Contributes to CURA-2007.

Browse source 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
This commit is contained in:
Jack Ha 2016-08-04 18:22:36 +02:00
commit bfabf8d11a
10 changed files with 207 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -111,6 +111,9 @@ SettingItem
// 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
// (if user has explicitly set this).
if (definition.key == "material_bed_temperature") {
CuraApplication.log("## global value " + globalPropertyProvider.properties.value);
}
return (globalPropertyProvider.properties.value != null) ? globalPropertyProvider.properties.value : propertyProvider.properties.resolve;
} else {
return propertyProvider.properties.value;