diff options
| author | Juan Linietsky | 2015-11-25 00:29:23 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-11-25 00:29:23 -0300 |
| commit | bd10df93ec1c19405659ed82e6c7116921ba5e0c (patch) | |
| tree | 3c4cd3528af685a0c75cf5bd4b0d81cd42fe9e22 /tools/editor/editor_node.cpp | |
| parent | b987d2113b491a4427310e23408c9a31a4f369e4 (diff) | |
| parent | a1059e3e3e54e9921c0426c8a5c9faf595175cf0 (diff) | |
| download | godot-bd10df93ec1c19405659ed82e6c7116921ba5e0c.tar.gz godot-bd10df93ec1c19405659ed82e6c7116921ba5e0c.tar.zst godot-bd10df93ec1c19405659ed82e6c7116921ba5e0c.zip | |
Merge branch 'master' of https://github.com/godotengine/godot
Conflicts:
drivers/ogg/SCsub
drivers/vorbis/SCsub
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/editor_node.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 4e2259288..01e53ead1 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -169,9 +169,18 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) { if (!p_event.key.mod.shift && !p_event.key.mod.command) _editor_select(3); break;*/ - case KEY_F1: _editor_select(0); break; - case KEY_F2: _editor_select(1); break; - case KEY_F3: _editor_select(2); break; + case KEY_F1: + if (!p_event.key.mod.shift && !p_event.key.mod.command) + _editor_select(0); + break; + case KEY_F2: + if (!p_event.key.mod.shift && !p_event.key.mod.command) + _editor_select(1); + break; + case KEY_F3: + if (!p_event.key.mod.shift && !p_event.key.mod.command) + _editor_select(2); + break; case KEY_F5: _menu_option_confirm((p_event.key.mod.control&&p_event.key.mod.shift)?RUN_PLAY_CUSTOM_SCENE:RUN_PLAY,true); break; case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break; case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break; @@ -2519,7 +2528,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { case OBJECT_REQUEST_HELP: { if (current) { - _editor_select(3); + _editor_select(2); emit_signal("request_help",current->get_type()); } |