godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing UID handling in Dependency Editor

Browse Source
This commit is contained in:
kobewi 2023-02-11 23:47:43 +01:00
parent ae896bbd85
commit 06eff95d64
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/dependency_editor.cpp
View File

@ -191,10 +191,16 @@ void DependencyEditor::_update_list() {
ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(path); ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(path);
if (uid != ResourceUID::INVALID_ID) { if (uid != ResourceUID::INVALID_ID) {
// dependency is in uid format, obtain proper path // Dependency is in uid format, obtain proper path.
ERR_CONTINUE(!ResourceUID::get_singleton()->has_id(uid)); if (ResourceUID::get_singleton()->has_id(uid)) {
path = ResourceUID::get_singleton()->get_id_path(uid);
path = ResourceUID::get_singleton()->get_id_path(uid); } else if (n.get_slice_count("::") >= 3) {
// If uid can't be found, try to use fallback path.
path = n.get_slice("::", 2);
} else {
ERR_PRINT("Invalid dependency UID and fallback path.");
continue;
}
} }
String name = path.get_file(); String name = path.get_file();

12
scene/resources/resource_format_text.cpp
View File

@ -851,26 +851,34 @@ void ResourceLoaderText::get_dependencies(Ref<FileAccess> p_f, List<String> *p_d
String path = next_tag.fields["path"]; String path = next_tag.fields["path"];
String type = next_tag.fields["type"]; String type = next_tag.fields["type"];
String fallback_path;
bool using_uid = false; bool using_uid = false;
if (next_tag.fields.has("uid")) { if (next_tag.fields.has("uid")) {
//if uid exists, return uid in text format, not the path // If uid exists, return uid in text format, not the path.
String uidt = next_tag.fields["uid"]; String uidt = next_tag.fields["uid"];
ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(uidt); ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(uidt);
if (uid != ResourceUID::INVALID_ID) { if (uid != ResourceUID::INVALID_ID) {
fallback_path = path; // Used by Dependency Editor, in case uid path fails.
path = ResourceUID::get_singleton()->id_to_text(uid); path = ResourceUID::get_singleton()->id_to_text(uid);
using_uid = true; using_uid = true;
} }
} }
if (!using_uid && !path.contains("://") && path.is_relative_path()) { if (!using_uid && !path.contains("://") && path.is_relative_path()) {
// path is relative to file being loaded, so convert to a resource path // Path is relative to file being loaded, so convert to a resource path.
path = ProjectSettings::get_singleton()->localize_path(local_path.get_base_dir().path_join(path)); path = ProjectSettings::get_singleton()->localize_path(local_path.get_base_dir().path_join(path));
} }
if (p_add_types) { if (p_add_types) {
path += "::" + type; path += "::" + type;
} }
if (!fallback_path.is_empty()) {
if (!p_add_types) {
path += "::"; // Ensure that path comes third, even if there is no type.
}
path += "::" + fallback_path;
}
p_dependencies->push_back(path); p_dependencies->push_back(path);