diff options
| author | Juan Linietsky | 2017-01-23 23:12:08 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-23 23:12:41 -0300 |
| commit | 3b019bf644f61aaa2eaf9276448d97fb6e6a868a (patch) | |
| tree | d9ccb2ad27aedad99d9781be1d1030bd28baf661 /tools/editor/editor_node.cpp | |
| parent | 2527566ca899e2ac9d8baa8b4e68a22bf7077f35 (diff) | |
| download | godot-3b019bf644f61aaa2eaf9276448d97fb6e6a868a.tar.gz godot-3b019bf644f61aaa2eaf9276448d97fb6e6a868a.tar.zst godot-3b019bf644f61aaa2eaf9276448d97fb6e6a868a.zip | |
Ability to delete, drag and drop audio buses!
Diffstat (limited to '')
| -rw-r--r-- | tools/editor/editor_node.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 9adb82a3b..2d66429ea 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -55,7 +55,7 @@ #include "animation_editor.h" #include "io/stream_peer_ssl.h" #include "main/input_default.h" - +#include "os/input.h" // plugins #include "plugins/sprite_frames_editor_plugin.h" #include "plugins/texture_region_editor_plugin.h" @@ -2405,8 +2405,12 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { case EDIT_UNDO: { - if (OS::get_singleton()->get_mouse_button_state()) + + + if (Input::get_singleton()->get_mouse_button_mask()&0x7) { + print_line("no because state"); break; // can't undo while mouse buttons are pressed + } String action = editor_data.get_undo_redo().get_current_action_name(); if (action!="") @@ -2416,7 +2420,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { } break; case EDIT_REDO: { - if (OS::get_singleton()->get_mouse_button_state()) + if (Input::get_singleton()->get_mouse_button_mask()&0x7) break; // can't redo while mouse buttons are pressed editor_data.get_undo_redo().redo(); |