Always spawn as 3D when there is a camera at a non-root path

crates/re_space_view_spatial/src/space_view_3d.rs

@@ -54,31 +54,26 @@ impl SpaceViewClass for SpatialSpaceView3D {
         space_origin: &EntityPath,
         per_system_entities: &PerSystemEntities,
     ) -> AutoSpawnHeuristic {
-        let score = auto_spawn_heuristic(
-            &self.name(),
-            ctx,
-            per_system_entities,
-            SpatialSpaceViewKind::ThreeD,
-        );
-
-        if let AutoSpawnHeuristic::SpawnClassWithHighestScoreForRoot(mut score) = score {
-            // If there's a camera at a non-root path, make 3D view higher priority.
-            if per_system_entities
-                .get(&CamerasPart::name())
-                .map_or(false, |c| {
-                    if c.contains(space_origin) {
-                        c.len() > 1 // Need another camera!
-                    } else {
-                        !c.is_empty()
-                    }
-                })
-            {
-                score += 100.0;
-            }
-
-            AutoSpawnHeuristic::SpawnClassWithHighestScoreForRoot(score)
+        // If there's a camera at a non-root path, always spawn as 3D view.
+        if per_system_entities
+            .get(&CamerasPart::name())
+            .map_or(false, |c| {
+                if c.contains(space_origin) {
+                    c.len() > 1 // Need another camera!
+                } else {
+                    !c.is_empty()
+                }
+            })
+        {
+            AutoSpawnHeuristic::AlwaysSpawn
         } else {
-            score
+            // Otherwise, fall back on the generic spatial heuristic
+            auto_spawn_heuristic(
+                &self.name(),
+                ctx,
+                per_system_entities,
+                SpatialSpaceViewKind::ThreeD,
+            )
         }
     }