godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Fix compilation errors with deprecated=no

Browse Source
This commit is contained in:
Lanza
2025-11-19 19:52:29 +08:00
committed by LanzaSchneider
parent b15a13eed3
commit af9be78054
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/project_upgrade/project_upgrade_tool.cpp
View File

@@ -79,8 +79,10 @@ void ProjectUpgradeTool::popup_dialog() {
void ProjectUpgradeTool::prepare_upgrade() { void ProjectUpgradeTool::prepare_upgrade() {
EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RUN_ON_RESTART, true); EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RUN_ON_RESTART, true);
#ifndef DISABLE_DEPRECATED
ProjectSettings::get_singleton()->set_setting("animation/compatibility/default_parent_skeleton_in_mesh_instance_3d", false); ProjectSettings::get_singleton()->set_setting("animation/compatibility/default_parent_skeleton_in_mesh_instance_3d", false);
ProjectSettings::get_singleton()->save(); ProjectSettings::get_singleton()->save();
#endif
Vector<String> reimport_paths; Vector<String> reimport_paths;
Vector<String> resave_scenes; Vector<String> resave_scenes;
@@ -107,7 +109,10 @@ void ProjectUpgradeTool::finish_upgrade() {
EditorFileSystem::get_singleton()->reimport_files(paths); EditorFileSystem::get_singleton()->reimport_files(paths);
EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_REIMPORT_PATHS, Variant()); EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_REIMPORT_PATHS, Variant());
#ifndef DISABLE_DEPRECATED
MeshInstance3D::upgrading_skeleton_compat = true; MeshInstance3D::upgrading_skeleton_compat = true;
#endif
{ {
paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, Vector<String>()); paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, Vector<String>());
EditorProgress ep("uid_upgrade_resave", TTR("Updating Project Scenes"), paths.size()); EditorProgress ep("uid_upgrade_resave", TTR("Updating Project Scenes"), paths.size());
@@ -121,7 +126,10 @@ void ProjectUpgradeTool::finish_upgrade() {
} }
EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, Variant()); EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, Variant());
} }
#ifndef DISABLE_DEPRECATED
MeshInstance3D::upgrading_skeleton_compat = false; MeshInstance3D::upgrading_skeleton_compat = false;
#endif
{ {
paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_RESOURCES, Vector<String>()); paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_RESOURCES, Vector<String>());