forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix panic: invalid SlotMap key used (#13990)

Browse Source 
# Objective

Tight, in-frame generation, re-parenting, despawning, etc., UI
operations could sometime lead taffy to panic (invalid SlotMap key used)
when an entity with an invalid state later despawned.

Fixes #12403 

## Solution

Move the `remove_entities` call after children updates.

## Testing

`sickle_ui` had a case that always caused the panic. Tested before this
change, after this change, and before the change again to make sure the
error is there without the fix. The fix worked. Test steps and used
commit described in issue #12403.

I have also ran every bevy UI example, though none of them deal with
entity re-parenting or removal. No regression detected on them.

Tested on Windows only.
This commit is contained in:
Tamás Kiss 2024-06-24 22:47:44 +02:00 committed by François
parent a41ed7822f
commit a0e7429363
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_ui/src/layout/mod.rs
View File

@ -190,9 +190,6 @@ pub fn ui_layout_system(
}
scale_factor_events.clear();
// clean up removed nodes
ui_surface.remove_entities(removed_components.removed_nodes.read());
// clean up removed cameras
ui_surface.remove_camera_entities(removed_components.removed_cameras.read());
@ -217,6 +214,9 @@ pub fn ui_layout_system(
}
}
// clean up removed nodes after syncing children to avoid potential panic (invalid SlotMap key used)
ui_surface.remove_entities(removed_components.removed_nodes.read());
for (camera_id, camera) in &camera_layout_info {
let inverse_target_scale_factor = camera.scale_factor.recip();