Create .uid files in EditorFileSystem #101650
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KoBeWi
commented
Jan 16, 2025
KoBeWi
commented
Jan 16, 2025
Comment on lines
+2372
to
+2380
| } else { | ||
| if (ResourceLoader::exists(file) && !ResourceLoader::has_custom_uid_support(file) && !FileAccess::exists(file + ".uid")) { | ||
| Ref<FileAccess> f = FileAccess::open(file + ".uid", FileAccess::WRITE); | ||
| if (f.is_valid()) { | ||
| const ResourceUID::ID id = ResourceUID::get_singleton()->create_id(); | ||
| ResourceUID::get_singleton()->add_id(id, file); | ||
| f->store_line(ResourceUID::get_singleton()->id_to_text(id)); | ||
| fi->uid = id; | ||
| } | ||
| } |
There was a problem hiding this comment.
The actual fix is here. The changes around are because of the fi variable.
This comment was marked as resolved.
This comment was marked as resolved.
KoBeWi
force-pushed
the
duality_of_uid_caches
branch
from
339ddb9 to
948bff0
Compare
|
It seems to solve the original problem. 👍 However (and I don't know if it's in the scope of this PR), when a script is moved, its path in the scene does not change.
Which mean that if the original resource moved, the button "open script" will open a new file. The path never changes, even after scene reload or editor restart. |
|
@geowarin I can't reproduce this problem, both with and without this PR, so it's likely unrelated. Open a new issue. |
|
Except for the little comment above, everything looks good. |
KoBeWi
force-pushed
the
duality_of_uid_caches
branch
from
948bff0 to
aa3048a
Compare
Hilderin
approved these changes
Jan 18, 2025
KoBeWi
force-pushed
the
duality_of_uid_caches
branch
from
aa3048a to
8aa3ee6
Compare
Repiteo
approved these changes
Jan 20, 2025
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #101591
Turns out the
ensure_uid_file()method I once added was wrong, because EditorFileSystem has its own uid cache. The bug occured, because the new UID was not registered in the EditorFileSystem, which is used by ResourceSaver to determine UIDs when saving.I fixed the bug for scripts and shaders, but I see more places where FileInfo is created. There might be some edge case where either UID is not registered or .uid file is not created, idk.