Fix relative external paths in binary resources - #123544
Open
shaobin1991 wants to merge 1 commit into
Open
shaobin1991 wants to merge 1 commit into
shaobin1991 wants to merge 1 commit into
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What problem(s) does this PR solve?
Relative external paths were resolved against the dependency path instead of the loaded resource's directory.
Additional information
pathis the dependency path. Using it as the base caused the bug:path = ProjectSettings::get_singleton()->localize_path(path.get_base_dir().path_join(external_resources[i].path));The relative path should be resolved from
local_pathinstead.This matches the relative-path resolution semantics used by the text resource loader:
path = ProjectSettings::get_singleton()->localize_path(local_path.get_base_dir().path_join(path));Testing
Added a regression test for a binary resource with a cross-directory relative external dependency.
Passed the focused regression test and the
[Resource]*test group locally.