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

Merge branch '2.3' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-10-25 16:50:55 +02:00
commit dd79be6595
32 changed files with 652 additions and 3080 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Settings/SettingItem.qml
View file

@ -202,6 +202,13 @@ Item {
return false;
}
if(!propertyProvider.properties.enabled)
{
// Note: This is not strictly necessary since a disabled setting is hidden anyway.
// But this will cause the binding to be re-evaluated when the enabled property changes.
return false;
}
if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
{
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;