Merge branch 'feature_settings_restricted_to_settingsbases'

This commit is contained in:
Tim Kuipers 2016-06-09 13:11:30 +02:00
commit b3cfa62775
4 changed files with 580 additions and 263 deletions

View file

@ -190,11 +190,11 @@ Item {
{
if(text != "")
{
listview.model.filter = {"global_only": false, "label": "*" + text}
listview.model.filter = {"settable_per_mesh": true, "label": "*" + text}
}
else
{
listview.model.filter = {"global_only": false}
listview.model.filter = {"settable_per_mesh": true}
}
}
}
@ -219,7 +219,7 @@ Item {
containerId: Cura.MachineManager.activeDefinitionId
filter:
{
"global_only": false
"settable_per_mesh": true
}
visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
}