godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Scene import: extract UID paths and store fallback

Browse Source 
When extracting meshes, materials and animations, always store the uid:// path as well as a res:// fallback.
When validating import settings, load the fallback path if the uid:// path fails to load.
Update save_to_file/fallback_path every import to keep the file path in sync with the uid.
Use UID hashing for meshes and animations.
This commit is contained in:
Lyuma
2025-02-12 03:38:14 -08:00
committed by Rémi Verschelde
parent fdbf6ecc9f
commit 8997c999e9
3 changed files with 123 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor/import/3d/scene_import_settings.cpp
View File

@@ -1585,6 +1585,10 @@ void SceneImportSettingsDialog::_save_dir_confirm() {
continue; //ignore
}
String path = item->get_text(1);
String uid_path = path;
if (path.begins_with("uid://")) {
path = ResourceUID::uid_to_path(uid_path);
}
if (!path.is_resource_file()) {
continue;
}
@@ -1601,9 +1605,11 @@ void SceneImportSettingsDialog::_save_dir_confirm() {
EditorNode::get_singleton()->add_io_error(TTR("Can't make material external to file, write error:") + "\n\t" + path);
continue;
}
uid_path = ResourceUID::path_to_uid(path);
md.settings["use_external/enabled"] = true;
md.settings["use_external/path"] = path;
md.settings["use_external/path"] = uid_path;
md.settings["use_external/fallback_path"] = path;
} break;
case ACTION_CHOOSE_MESH_SAVE_PATHS: {
@@ -1611,14 +1617,16 @@ void SceneImportSettingsDialog::_save_dir_confirm() {
MeshData &md = mesh_map[id];
md.settings["save_to_file/enabled"] = true;
md.settings["save_to_file/path"] = path;
md.settings["save_to_file/path"] = uid_path;
md.settings["save_to_file/fallback_path"] = path;
} break;
case ACTION_CHOOSE_ANIMATION_SAVE_PATHS: {
ERR_CONTINUE(!animation_map.has(id));
AnimationData &ad = animation_map[id];
ad.settings["save_to_file/enabled"] = true;
ad.settings["save_to_file/path"] = path;
ad.settings["save_to_file/path"] = uid_path;
ad.settings["save_to_file/fallback_path"] = path;
} break;
}