Skip to content

Commit ee2930c

Browse files
committed
Remove temporary project conversion
This project conversion should be removed before the next stable release, because it affects only projects opened during dev-builds.
1 parent dc5f1b7 commit ee2930c

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

core/config/project_settings.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -514,24 +514,6 @@ void ProjectSettings::_convert_to_last_version(int p_from_version) {
514514
}
515515
}
516516
}
517-
if (p_from_version == 5) {
518-
// Converts the device in events from -3 to -1.
519-
// -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.
520-
// -3 was used during dev-releases, so this conversion helps to revert such affected projects.
521-
// This conversion doesn't affect any other projects, since -3 is not used otherwise.
522-
for (KeyValue<StringName, ProjectSettings::VariantContainer> &E : props) {
523-
if (String(E.key).begins_with("input/")) {
524-
Dictionary action = E.value.variant;
525-
Array events = action["events"];
526-
for (int i = 0; i < events.size(); i++) {
527-
Ref<InputEvent> ev = events[i];
528-
if (ev.is_valid() && ev->get_device() == -3) {
529-
ev->set_device(-1);
530-
}
531-
}
532-
}
533-
}
534-
}
535517
#endif // DISABLE_DEPRECATED
536518
}
537519

editor/editor_settings.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,6 @@ bool EditorSettings::_set_only(const StringName &p_name, const Variant &p_value)
103103

104104
builtin_action_overrides[action_name].clear();
105105
for (int ev_idx = 0; ev_idx < events.size(); ev_idx++) {
106-
#ifndef DISABLE_DEPRECATED
107-
// -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.
108-
// -3 was used during dev-releases, so this conversion helps to revert such affected editor shortcuts.
109-
Ref<InputEvent> x = events[ev_idx];
110-
if (x.is_valid() && x->get_device() == -3) {
111-
x->set_device(-1);
112-
}
113-
#endif // DISABLE_DEPRECATED
114106
im->action_add_event(action_name, events[ev_idx]);
115107
builtin_action_overrides[action_name].push_back(events[ev_idx]);
116108
}

0 commit comments

Comments
 (0)