3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix resolve in profile bug. Removed unnecessary imports. Removed unnecessary watch. Contributes to CURA-2007

Browse source
This commit is contained in:
Jack Ha 2016-08-24 11:36:10 +02:00
parent 0268bf3f56
commit 9521a85318
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ SettingItem
target: input
property: "text"
value: {
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0)) {
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) {
// 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).

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

@ -125,7 +125,7 @@ ScrollView
id: inheritStackProvider
containerStackId: Cura.MachineManager.activeMachineId
key: model.key
watchedProperties: [ "global_inherits_stack", "value" ]
watchedProperties: [ "global_inherits_stack" ]
}
UM.SettingPropertyProvider