Merge branch 'master' of github.com:komadori/bevy_mod_outline into bevy-0.19

Author: komadori

CHANGELOG.md

@@ -11,6 +11,12 @@
 ### Changed
 - Updated Bevy dependency to 0.19.
 
+## bevy_mod_outline 0.12.1 (2026-05-11)
+
+## Changed
+- Fixed recursive AsyncSceneInheritOutline. (@Shatur)
+- Fixed panic in AutoGenerateOutlineNormalsPlugin with render-world only meshes.
+
 ## bevy_mod_outline 0.12.0 (2026-02-17)
 
 ### Removed

src/generate.rs

@@ -1,4 +1,5 @@
 use bevy::{
+    asset::RenderAssetUsages,
     math::FloatOrd,
     mesh::{Indices, VertexAttributeValues},
     platform::collections::{HashMap, HashSet},
@@ -197,8 +198,10 @@ fn auto_generate_outline_normals(
                     // Suppress modification events created by this system
                     squelch.remove(id);
                 } else if let Some(mut mesh) = meshes.get_mut(*id) {
-                    let _ = mesh.generate_outline_normals(&plugin.settings);
-                    squelch.insert(*id);
+                    if mesh.asset_usage.contains(RenderAssetUsages::MAIN_WORLD) {
+                        let _ = mesh.generate_outline_normals(&plugin.settings);
+                        squelch.insert(*id);
+                    }
                 }
             }
             AssetEvent::Removed { id } => {

src/world_serialisation.rs

@@ -41,13 +41,14 @@ fn add_outline(
     mut commands: Commands,
     mut query: Query<(&mut AsyncWorldInheritOutline, Option<&WorldInstance>)>,
     systems: Res<AsyncWorldInheritOutlineSystems>,
-    world_spawner: Res<WorldInstanceSpawner>,
+    world_spawner: Option<Res<WorldInstanceSpawner>>,
 ) {
     let Ok((mut scene_outline, scene_instance)) = query.get_mut(*entity_input) else {
         return;
     };
     let mut ready = false;
-    if let Some(scene_instance) = scene_instance {
+    // Assume that this scene cannot be ready if the SceneSpawner is currently in use.
+    if let (Some(scene_instance), Some(world_spawner)) = (scene_instance, world_spawner) {
         let iid = **scene_instance;
         if world_spawner.instance_is_ready(iid) {
             for child in world_spawner.iter_instance_entities(iid) {
@@ -240,4 +241,23 @@ mod tests {
         app.update();
         assert_counts(&mut app, 2, 0);
     }
+
+    #[test]
+    fn test_add_when_scene_spawner_missing() {
+        let (mut app, scene_entity) = setup();
+
+        let scene_spawner = app
+            .world_mut()
+            .remove_resource::<WorldInstanceSpawner>()
+            .unwrap();
+        app.world_mut()
+            .get_entity_mut(scene_entity)
+            .unwrap()
+            .insert(AsyncWorldInheritOutline::default());
+        app.world_mut().flush();
+        app.world_mut().insert_resource(scene_spawner);
+
+        app.update();
+        assert_counts(&mut app, 0, 2);
+    }
 }