Fix AssetChanged<A> UB#23138
Merged
alice-i-cecile merged 5 commits intobevyengine:mainfrom Mar 1, 2026
Merged
Conversation
Member
|
Regression test please :) |
Contributor
Author
|
I did. That's the extra test I added. |
Member
|
Ah sorry, missed that! |
chescock
approved these changes
Feb 25, 2026
Contributor
chescock
left a comment
There was a problem hiding this comment.
Yay!
One nit on comments: GitHub won't let me comment there, but there is a safety comment in init_fetch that says
// - `update_component_access` declares a read on `state.resource_id`, so it is safe to
// read that resource here (see trait-level safety comments on `WorldQuery`, regarding
// readonly resource access in `init_fetch`)
and should probably be changed to mention init_nested_access instead.
Co-authored-by: Chris Russell <8494645+chescock@users.noreply.github.com>
andriyDev
reviewed
Mar 1, 2026
|
|
||
| let mut filter = FilteredAccess::default(); | ||
| filter.add_component_read(state.resource_id); | ||
| filter.add_resource_read(state.resource_id); |
Contributor
There was a problem hiding this comment.
Why do we need both a component read and resource read?
Contributor
Author
There was a problem hiding this comment.
This ensures that this correctly conflicts with FilteredResources, which only uses resource accesses, and Query<&mut MyResource>, which only uses component accesses. This is fixed in #22910, which comes right after this PR.
andriyDev
approved these changes
Mar 1, 2026
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
4 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.
Objective
Fixes #23057.
Solution
Uses Nested Queries from #21557 to also register the resource entity to the access set.
Testing
Added an extra test.