godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse Source
This commit is contained in:
Juan Linietsky
2015-12-15 23:40:29 -03:00
parent a1142225bf 08cab3a17a
commit 686c65a354
7 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/editor/project_settings.cpp
View File

@@ -427,9 +427,10 @@ void ProjectSettings::_update_actions() {
item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
item->set_text(0,name);
item->add_button(0,get_icon("Add","EditorIcons"),1);
if (!Globals::get_singleton()->get_input_presets().find(pi.name))
if (!Globals::get_singleton()->get_input_presets().find(pi.name)) {
item->add_button(0,get_icon("Rename","EditorIcons"),2);
item->add_button(0,get_icon("Remove","EditorIcons"),3);
item->add_button(0,get_icon("Remove","EditorIcons"),3);
}
item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
item->set_editable(0,true);
item->set_checked(0,pi.usage&PROPERTY_USAGE_CHECKED);