3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 13:21:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '2.3'

Browse source
This commit is contained in:
Ghostkeeper 2016-10-25 11:50:20 +02:00
commit e3ae3d50f9
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -194,7 +194,6 @@ Item {
// Inherit button needs to be visible if;
// - User made changes that override any loaded settings
// - This setting item uses inherit button at all
// - The revert button is not visible.
// - The type of the value of any deeper container is an "object" (eg; is a function)
visible:
{
@ -203,12 +202,6 @@ Item {
return false;
}
if(revertButton.visible)
{
// The revert button already indicates there is a custom value for this setting, making this button superfluous.
return false;
}
if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
{
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;