From 6c7a0d73c3c6e755bd91b10295ebfba1f068c2c5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Sep 2016 15:01:08 +0200 Subject: [PATCH 1/2] Resolve now also returns value if resolve was undefined CURA-2319 --- resources/qml/Settings/SettingTextField.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index e4c93d9b8c..d02c8854b4 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -114,7 +114,7 @@ SettingItem // 3: material -> user changed material in materialspage // 4: variant // 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 to choose between the resolved value (default) and the global value // (if user has explicitly set this). From b7351a56e416beec25dbbaf4d4b14a1609251d2b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Sep 2016 15:07:37 +0200 Subject: [PATCH 2/2] Added forcefull property changed if perobjectsettings extruder was changed CURA-2319 --- plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index ae6ccd277e..ed5b962419 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -260,6 +260,14 @@ Item { storeIndex: 0 removeUnusedValue: false } + + // If the extruder by which the object needs to be printed is changed, ensure that the + // display is also notified of the fact. + Connections + { + target: extruderSelector + onActivated: provider.forcePropertiesChanged() + } } } }