diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-22 19:17:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-22 19:17:24 -0300 |
| commit | 84d7a559e5198478b1ae23d00dbd966461aadfe7 (patch) | |
| tree | 8480de1917859c12d8c0b081c87190ae07d65244 /tools/editor/editor_node.cpp | |
| parent | 9d571d8eacb07e1b96de049feca976b3309cd21d (diff) | |
| parent | ed3c73408b3b0ddf234ddcc5349fe85831e3ebba (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/editor_node.cpp')
| -rw-r--r-- | tools/editor/editor_node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 3888ed23a6..eae2d69dd9 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -164,7 +164,7 @@ void EditorNode::_update_title() { void EditorNode::_unhandled_input(const InputEvent& p_event) { - if (p_event.type==InputEvent::KEY && p_event.key.pressed && !p_event.key.echo) { + if (p_event.type==InputEvent::KEY && p_event.key.pressed && !p_event.key.echo && !gui_base->get_viewport()->gui_has_modal_stack()) { switch(p_event.key.scancode) { |