Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #71322 from EricEzaM/55856-proj-settings-initial-array-dict-shared-instance

Browse source 
Fix Project Settings array/dicts initial value being shared instances of the current value.
This commit is contained in:
Rémi Verschelde 2023-02-01 07:29:44 +01:00
commit 27fdb06fed
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
editor/project_settings_editor.cpp
View file

@ -370,17 +370,7 @@ void ProjectSettingsEditor::_action_edited(const String &p_name, const Dictionar
} else {
// Events changed
int act_event_count = ((Array)p_action["events"]).size();
int old_event_count = ((Array)old_val["events"]).size();
if (act_event_count == old_event_count) {
undo_redo->create_action(TTR("Edit Input Action Event"));
} else if (act_event_count > old_event_count) {
undo_redo->create_action(TTR("Add Input Action Event"));
} else {
undo_redo->create_action(TTR("Remove Input Action Event"));
}
undo_redo->create_action(TTR("Change Input Action Event(s)"));
undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", property_name, p_action);
undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set", property_name, old_val);
}
@ -527,6 +517,8 @@ void ProjectSettingsEditor::_update_action_map_editor() {
if (is_builtin_input) {
action_info.editable = false;
action_info.icon = builtin_icon;
action_info.has_initial = true;
action_info.action_initial = ProjectSettings::get_singleton()->property_get_revert(property_name);
}
actions.push_back(action_info);