3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-10-27 17:15:58 +02:00
commit 999380cf1b
9 changed files with 89 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/ultimaker2_plus.def.json
View file

@ -40,7 +40,7 @@
"value": "speed_wall_0"
},
"machine_height": {
"default_value": 203
"default_value": 205
},
"machine_show_variants": {
"default_value": true

2
resources/qml/Menus/ProfileMenu.qml
View file

@ -13,7 +13,7 @@ Menu
Instantiator
{
model: Cura.ProfilesModel { }
model: Cura.ProfilesModel
MenuItem
{

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

@ -208,12 +208,14 @@ Item {
// But this will cause the binding to be re-evaluated when the enabled property changes.
return false;
}
if(Cura.SettingInheritanceManager.settingsWithInheritanceWarning.length == 0)
{
return false;
}
if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
{
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
}
return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, globalPropertyProvider.properties.limit_to_extruder).indexOf(definition.key) >= 0;
}