diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-28 16:20:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 16:20:20 +0200 |
| commit | d44c5cfcf72eec2fbf76afe6fd9e43ee3bcab216 (patch) | |
| tree | 4ce75cb592dbf7ce1f367f778a8b3b306727b2f8 /core/debugger/remote_debugger.cpp | |
| parent | b9e58ed5b869cf2caf946be9a5e3b9066e1387eb (diff) | |
| parent | fdf58a585839804c89798392dd93025dbe8654e4 (diff) | |
| download | redot-engine-d44c5cfcf72eec2fbf76afe6fd9e43ee3bcab216.tar.gz | |
Merge pull request #38295 from akien-mga/input-is-back
Rename InputFilter back to Input
Diffstat (limited to 'core/debugger/remote_debugger.cpp')
| -rw-r--r-- | core/debugger/remote_debugger.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp index e6bcc5f77e..fd109c62b6 100644 --- a/core/debugger/remote_debugger.cpp +++ b/core/debugger/remote_debugger.cpp @@ -33,7 +33,7 @@ #include "core/debugger/debugger_marshalls.h" #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" -#include "core/input/input_filter.h" +#include "core/input/input.h" #include "core/os/os.h" #include "core/project_settings.h" #include "core/script_language.h" @@ -659,9 +659,9 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { servers_profiler->skip_profile_frame = true; // Avoid frame time spike in debug. - InputFilter::MouseMode mouse_mode = InputFilter::get_singleton()->get_mouse_mode(); - if (mouse_mode != InputFilter::MOUSE_MODE_VISIBLE) - InputFilter::get_singleton()->set_mouse_mode(InputFilter::MOUSE_MODE_VISIBLE); + Input::MouseMode mouse_mode = Input::get_singleton()->get_mouse_mode(); + if (mouse_mode != Input::MOUSE_MODE_VISIBLE) + Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_VISIBLE); uint64_t loop_begin_usec = 0; uint64_t loop_time_sec = 0; @@ -779,8 +779,8 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) { send_message("debug_exit", Array()); - if (mouse_mode != InputFilter::MOUSE_MODE_VISIBLE) - InputFilter::get_singleton()->set_mouse_mode(mouse_mode); + if (mouse_mode != Input::MOUSE_MODE_VISIBLE) + Input::get_singleton()->set_mouse_mode(mouse_mode); } void RemoteDebugger::poll_events(bool p_is_idle) { |