From 47447beb9340eb6d591e0391f32d325bc44379c7 Mon Sep 17 00:00:00 2001
From: robtfm <50659922+robtfm@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:00:50 +0000
Subject: [PATCH] try_insert Aabbs (#10801)

# Objective

avoid panics from `calculate_bounds` systems if entities are despawned
in PostUpdate.

there's a running general discussion (#10166) about command panicking.
in the meantime we may as well fix up some cases where it's clear a
failure to insert is safe.

## Solution

change `.insert(aabb)` to `.try_insert(aabb)`
---
 crates/bevy_render/src/view/visibility/mod.rs | 2 +-
 crates/bevy_sprite/src/lib.rs                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/bevy_render/src/view/visibility/mod.rs b/crates/bevy_render/src/view/visibility/mod.rs
index aa23826430a26..8311268640bb1 100644
--- a/crates/bevy_render/src/view/visibility/mod.rs
+++ b/crates/bevy_render/src/view/visibility/mod.rs
@@ -269,7 +269,7 @@ pub fn calculate_bounds(
     for (entity, mesh_handle) in &without_aabb {
         if let Some(mesh) = meshes.get(mesh_handle) {
             if let Some(aabb) = mesh.compute_aabb() {
-                commands.entity(entity).insert(aabb);
+                commands.entity(entity).try_insert(aabb);
             }
         }
     }
diff --git a/crates/bevy_sprite/src/lib.rs b/crates/bevy_sprite/src/lib.rs
index ce5b12e6a5c89..89f9693d78a40 100644
--- a/crates/bevy_sprite/src/lib.rs
+++ b/crates/bevy_sprite/src/lib.rs
@@ -129,7 +129,7 @@ pub fn calculate_bounds_2d(
     for (entity, mesh_handle) in &meshes_without_aabb {
         if let Some(mesh) = meshes.get(&mesh_handle.0) {
             if let Some(aabb) = mesh.compute_aabb() {
-                commands.entity(entity).insert(aabb);
+                commands.entity(entity).try_insert(aabb);
             }
         }
     }
@@ -142,7 +142,7 @@ pub fn calculate_bounds_2d(
                 center: (-sprite.anchor.as_vec() * size).extend(0.0).into(),
                 half_extents: (0.5 * size).extend(0.0).into(),
             };
-            commands.entity(entity).insert(aabb);
+            commands.entity(entity).try_insert(aabb);
         }
     }
     for (entity, atlas_sprite, atlas_handle) in &atlases_without_aabb {
@@ -156,7 +156,7 @@ pub fn calculate_bounds_2d(
                 center: (-atlas_sprite.anchor.as_vec() * size).extend(0.0).into(),
                 half_extents: (0.5 * size).extend(0.0).into(),
             };
-            commands.entity(entity).insert(aabb);
+            commands.entity(entity).try_insert(aabb);
         }
     }
 }