Detach reattach propagation fix#24019
Merged
alice-i-cecile merged 2 commits intobevyengine:mainfrom Apr 28, 2026
Merged
Conversation
…nd immediately reattaching a child.
…nherited<C>>` if they currently have `Inherited<C>`.
alice-i-cecile
approved these changes
Apr 28, 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
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 #23893
Chain of events as far as I can follow it:
on_r_removed<C, R>observer system triggered byOn<Remove, R>removes theInherited<C>component from E.on_r_inserted<C, R>observer system triggered byOn<Insert, R>insertsInherited<C>back again on E.propagated_inheritedqueries for changes, adds(E, Inherited<C>)toto_process.propagate_inheritedqueries forRemovedComponents<Inherited<C>>, adds(F, None)toto_processfor each F descended from E.to_processis processed.(F, None)entries are processed first, recursively removingInherited<C>from E's descendants using deferred commands.(E, Inherited<C>)is ignored as the defererred commands haven't been applied yet so the current inherited state matches the queued inherited state.Solution
If an entity from
RemovedComponents<Inherited<C>>hasInherited<C>, don't add its descendants to theto_processstack.Not super confident in this change, but the new test passes and none of the old tests fail.
Testing
New test:
test_detach_and_reattach_propagates_to_descendants