Merge branch 'main' into main

crates/bevy_animation/src/keyframes.rs

@@ -8,7 +8,7 @@ use core::{
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::{component::Component, world::Mut};
 use bevy_math::{Quat, Vec3};
-use bevy_reflect::{FromReflect, GetTypeRegistration, Reflect, TypePath, Typed};
+use bevy_reflect::{FromReflect, Reflect, Reflectable, TypePath};
 use bevy_render::mesh::morph::MorphWeights;
 use bevy_transform::prelude::Transform;
 
@@ -69,16 +69,7 @@ pub trait AnimatableProperty: Reflect + TypePath + 'static {
     type Component: Component;
 
     /// The type of the property to be animated.
-    type Property: Animatable
-        + FromReflect
-        + GetTypeRegistration
-        + Reflect
-        + TypePath
-        + Typed
-        + Clone
-        + Sync
-        + Debug
-        + 'static;
+    type Property: Animatable + FromReflect + Reflectable + Clone + Sync + Debug + 'static;
 
     /// Given a reference to the component, returns a reference to the property.
     ///

crates/bevy_render/src/view/window/cursor.rs

@@ -166,9 +166,10 @@ pub fn update_cursors(
 
 /// Resets the cursor to the default icon when `CursorIcon` is removed.
 pub fn on_remove_cursor_icon(trigger: Trigger<OnRemove, CursorIcon>, mut commands: Commands) {
+    // Use `try_insert` to avoid panic if the window is being destroyed.
     commands
         .entity(trigger.entity())
-        .insert(PendingCursor(Some(CursorSource::System(
+        .try_insert(PendingCursor(Some(CursorSource::System(
             convert_system_cursor_icon(SystemCursorIcon::Default),
         ))));
 }