diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-29 11:46:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 11:46:32 +0200 |
| commit | 22b3e9f76a22fa32e9c4078080f6bbd792c216c9 (patch) | |
| tree | 01250f4933a8d1a3db6a0b7a26e4667109214c11 | |
| parent | 8c72b15e51bed856cceb569bf6dbdb6012a63fcc (diff) | |
| parent | 46519ba52cfd9c372020e79c4200261970d81cd9 (diff) | |
Merge pull request #42385 from Craig-Stoneham/patch-2
Remove unnecessary keyword
| -rw-r--r-- | core/input/input_map.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_settings.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp index 2bf8792421..6319ffc8f1 100644 --- a/core/input/input_map.cpp +++ b/core/input/input_map.cpp @@ -128,7 +128,7 @@ void InputMap::action_add_event(const StringName &p_action, const Ref<InputEvent ERR_FAIL_COND_MSG(p_event.is_null(), "It's not a reference to a valid InputEvent object."); ERR_FAIL_COND_MSG(!input_map.has(p_action), "Request for nonexistent InputMap action '" + String(p_action) + "'."); if (_find_event(input_map[p_action], p_event)) { - return; //already gots + return; // Already addded. } input_map[p_action].inputs.push_back(p_event); diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 4896fb58db..04bb49bb51 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -44,7 +44,6 @@ class EditorPlugin; class EditorSettings : public Resource { GDCLASS(EditorSettings, Resource); -private: _THREAD_SAFE_CLASS_ public: |