Fix² behavior of ResourceFormatLoader CACHE_MODE_REPLACE
#87008
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 9, 2024
core/io/resource_loader.cpp
Outdated
Comment on lines
343
to
350
| if (load_task.cache_mode == ResourceFormatLoader::CACHE_MODE_REPLACE) { | ||
| Ref<Resource> res = ResourceCache::get_ref(load_task.local_path); | ||
| if (res.is_valid() && res != load_task.resource) { | ||
| // If resource is already loaded, only replace its data, to avoid existing invalidating instances. | ||
| res->copy_from(load_task.resource); | ||
| load_task.resource = res; | ||
| } | ||
| } |
There was a problem hiding this comment.
This part is added by this PR and it's the only difference from the previous one.
KoBeWi
force-pushed
the
cache_mode_replace_fixes²
branch
from
091883c to
2e09985
Compare
RandomShaper
approved these changes
Feb 13, 2024
|
Thanks! |
RandomShaper
added a commit
to RandomShaper/godot
that referenced
this pull request
Feb 26, 2024
- Unify documentation, hoping to clear misconcepctions about about propagation of the cache mode across dependant loads. - Clarify in docs that `CACHE_MODE_REPLACE` now also works on the main resource (from godotengine#87008). - Add two recursive modes, counterparts of `CACHE_MODE_REPLACE` and `CACHE_MODE_IGNORE`, since it seems some need them (see godotengine#59669, godotengine#82830). - Let resources, even loaded with one of the ignore-cache modes, get a path, which is useful for tools.
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.
Same as #84167, but does not introduce #86187
When a resource is already loaded,
CACHE_MODE_REPLACEwill usecopy_from()to replace the data in the loaded instances (in the previous version of this PR, the old instances were invalidated and made local).Fixes #81498