summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-01-25 20:17:03 +0100
committerGitHub <noreply@github.com>2017-01-25 20:17:03 +0100
commit266fbd8c7624a0f4c41c5c6296f12059c69c77fb (patch)
tree1716eb36b4190b9dbfce4baba3014b2a66742cf4
parent4b9ec15124c8784d11980a467318c585bbc0e0e2 (diff)
parentd59d8991035db5c33f04266823ad2aa686758a82 (diff)
Merge pull request #7642 from guilhermefelipecgs/add_category
Add run/output category [ci skip]
-rw-r--r--tools/editor/editor_node.cpp4
-rw-r--r--tools/editor/editor_settings.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index c39dea2d72..bd54eaceb6 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -1928,11 +1928,11 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
editor_data.save_editor_external_data();
}
- if (bool(EDITOR_DEF("run/always_clear_output_on_play", true))) {
+ if (bool(EDITOR_DEF("run/output/always_clear_output_on_play", true))) {
log->clear();
}
- if (bool(EDITOR_DEF("run/always_open_output_on_play", true))) {
+ if (bool(EDITOR_DEF("run/output/always_open_output_on_play", true))) {
make_bottom_panel_item_visible(log);
}
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 27aeaeb5b6..822497fcab 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -653,6 +653,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
set("run/auto_save/save_before_running",true);
+ set("run/output/always_clear_output_on_play",true);
+ set("run/output/always_open_output_on_play",true);
set("filesystem/resources/save_compressed_resources",true);
set("filesystem/resources/auto_reload_modified_images",true);