diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-08-23 20:22:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-08-23 20:22:08 -0300 |
| commit | 4b40f9228bdfe8573a2d70a6cd76404df117c8b9 (patch) | |
| tree | fba6e0bf34f1164c966667fd77995e79f2a0ec5d /tools/editor/editor_node.cpp | |
| parent | 07e97414250827c3b930befa123a4bbd48d24861 (diff) | |
| parent | e1e54d39e456c32c43442f3a7f5389597e535930 (diff) | |
| download | redot-engine-4b40f9228bdfe8573a2d70a6cd76404df117c8b9.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 9808026b63..597fb236f5 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1587,7 +1587,6 @@ void EditorNode::_run(bool p_current,const String& p_custom) { Node *scene = editor_data.get_edited_scene_root(); if (!scene) { - current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text("I see.."); @@ -1668,6 +1667,10 @@ 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))) { + log->clear(); + } + List<String> breakpoints; editor_data.get_editor_breakpoints(&breakpoints); |