[TileMap] Fix forcing cleanup on exiting tree/canvas #89975
Merged
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.
The code relies on that the deferred call is handled after the node exits the tree or canvas, this is because before the end of these notifications call both
is_inside_tree
andis_visible_in_tree
retain the values they had before, so these changes being called immediately makes it not force cleanup properlyThis feels like a pretty robust fix, and removes some unnecessary code, like the dedicated destructor flag, with the
p_force_cleanup
argument doing double duty here, I also moved thepending_update
clearing to_internal_update
, this avoids going through two other methods to reach the update (update_internals
->_deferred_internal_update
->_internal_update
), while still catching any pending updates that might come afterEdit 2: Will write up a 4.2 dedicated version as this can't be cherry-picked directly, will open a PR for that when this is approvedDone, as the solution got a basic go-ahead and will wait on other changes in 4.3