Prechádzať zdrojové kódy

Merge pull request #77134 from jpcerrone/fix_input_maps_on_project_conversion

Fix Input Map key assignments missing after project conversion
Rémi Verschelde 2 rokov pred
rodič
commit
b9c93ac78f

+ 1 - 0
editor/project_converter_3_to_4.cpp

@@ -439,6 +439,7 @@ bool ProjectConverter3To4::convert() {
 				rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
 				rename_common(RenamesMap3To4::builtin_types_renames, reg_container.builtin_types_regexes, source_lines);
 				rename_input_map_scancode(source_lines, reg_container);
 				rename_input_map_scancode(source_lines, reg_container);
 				rename_common(RenamesMap3To4::input_map_renames, reg_container.input_map_regexes, source_lines);
 				rename_common(RenamesMap3To4::input_map_renames, reg_container.input_map_regexes, source_lines);
+				custom_rename(source_lines, "config_version=4", "config_version=5");
 			} else if (file_name.ends_with(".csproj")) {
 			} else if (file_name.ends_with(".csproj")) {
 				// TODO
 				// TODO
 			} else if (file_name.ends_with(".import")) {
 			} else if (file_name.ends_with(".import")) {

+ 2 - 8
editor/project_manager.cpp

@@ -2272,14 +2272,6 @@ void ProjectManager::_perform_full_project_conversion() {
 	const String &path = selected_list[0].path;
 	const String &path = selected_list[0].path;
 
 
 	print_line("Converting project: " + path);
 	print_line("Converting project: " + path);
-
-	Ref<ConfigFile> cf;
-	cf.instantiate();
-	cf->load(path.path_join("project.godot"));
-	cf->set_value("", "config_version", GODOT4_CONFIG_VERSION);
-	cf->save(path.path_join("project.godot"));
-	_project_list->set_project_version(path, GODOT4_CONFIG_VERSION);
-
 	List<String> args;
 	List<String> args;
 	args.push_back("--path");
 	args.push_back("--path");
 	args.push_back(path);
 	args.push_back(path);
@@ -2287,6 +2279,8 @@ void ProjectManager::_perform_full_project_conversion() {
 
 
 	Error err = OS::get_singleton()->create_instance(args);
 	Error err = OS::get_singleton()->create_instance(args);
 	ERR_FAIL_COND(err);
 	ERR_FAIL_COND(err);
+
+	_project_list->set_project_version(path, GODOT4_CONFIG_VERSION);
 }
 }
 
 
 void ProjectManager::_run_project_confirm() {
 void ProjectManager::_run_project_confirm() {