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

try_insert NoAutomaticBatching (#12396)

Browse Source 
# Objective

fix occasional crash from commands.insert when quickly spawning and
despawning skinned/morphed meshes
 
## Solution

use `try_insert` instead of `insert`. if the entity is deleted we don't
mind failing to add the `NoAutomaticBatching` marker.
This commit is contained in:
robtfm 2024-03-10 02:14:33 +00:00 committed by GitHub
parent 8a08825348
commit cca4ab3663
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/bevy_pbr/src/render/morph.rs
View File

@ -109,6 +109,6 @@ pub fn no_automatic_morph_batching(
query: Query<Entity, (With<MeshMorphWeights>, Without<NoAutomaticBatching>)>,
) {
for entity in &query {
commands.entity(entity).insert(NoAutomaticBatching);
commands.entity(entity).try_insert(NoAutomaticBatching);
}
}

2
crates/bevy_pbr/src/render/skin.rs
View File

@ -146,6 +146,6 @@ pub fn no_automatic_skin_batching(
query: Query<Entity, (With<SkinnedMesh>, Without<NoAutomaticBatching>)>,
) {
for entity in &query {
commands.entity(entity).insert(NoAutomaticBatching);
commands.entity(entity).try_insert(NoAutomaticBatching);
}
}