diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-19 11:25:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-19 11:25:58 +0100 |
| commit | 61e26d4431181b8a305c237c846aad9dd95cfec2 (patch) | |
| tree | 521353ff8a9af391393ac130d32820dd14084a5c /scene | |
| parent | c8c3bcd32f831c6eae388950444f88a79ba1fdfe (diff) | |
| parent | 8d9256e13c0289d625cb5c5867ffb7e190dd604c (diff) | |
Merge pull request #44181 from EricEzaM/PR/INP5-new-input-editor
New Input Map Editor and Editor Settings Shortcut Editor
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/main/window.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scene/main/window.cpp b/scene/main/window.cpp index fc9bbeab94..9a2ffab199 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -881,10 +881,6 @@ bool Window::_can_consume_input_events() const { } void Window::_window_input(const Ref<InputEvent> &p_ev) { - if (Engine::get_singleton()->is_editor_hint() && (Object::cast_to<InputEventJoypadButton>(p_ev.ptr()) || Object::cast_to<InputEventJoypadMotion>(*p_ev))) { - return; //avoid joy input on editor - } - if (EngineDebugger::is_active()) { //quit from game window using F8 Ref<InputEventKey> k = p_ev; |