Skip to content

Commit

Permalink
Introduce a conversion for editor shortcuts
Browse files Browse the repository at this point in the history
This is temporary code for reverting effects, that were caused
by the reverted PR godotengineGH-97707.
  • Loading branch information
Sauermann committed Dec 12, 2024
1 parent 19e003b commit 294c115
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions editor/editor_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,14 @@ bool EditorSettings::_set_only(const StringName &p_name, const Variant &p_value)

builtin_action_overrides[action_name].clear();
for (int ev_idx = 0; ev_idx < events.size(); ev_idx++) {
#ifndef DISABLE_DEPRECATED
// -3 was introduced in GH-97707 as a way to prevent a clash in device IDs, but as reported in GH-99243, this leads to problems.
// -3 was used during dev-releases, so this conversion helps to revert such affected editor shortcuts.
Ref<InputEvent> x = events[ev_idx];
if (x.is_valid() && x->get_device() == -3) {
x->set_device(-1);
}
#endif // DISABLE_DEPRECATED
im->action_add_event(action_name, events[ev_idx]);
builtin_action_overrides[action_name].push_back(events[ev_idx]);
}
Expand Down

0 comments on commit 294c115

Please sign in to comment.