Change most RenderApp accesses to panics instead of silently doing nothing/half the work.

crates/bevy_anti_aliasing/src/contrast_adaptive_sharpening/mod.rs

@@ -108,9 +108,9 @@ impl Plugin for CasPlugin {
             UniformComponentPlugin::<CasUniform>::default(),
         ));
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<SpecializedRenderPipelines<CasPipeline>>()
             .add_systems(Render, prepare_cas_pipelines.in_set(RenderSystems::Prepare));
@@ -152,9 +152,9 @@ impl Plugin for CasPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app.init_resource::<CasPipeline>();
     }
 }

crates/bevy_anti_aliasing/src/fxaa/mod.rs

@@ -89,9 +89,9 @@ impl Plugin for FxaaPlugin {
         app.register_type::<Fxaa>();
         app.add_plugins(ExtractComponentPlugin::<Fxaa>::default());
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<SpecializedRenderPipelines<FxaaPipeline>>()
             .add_systems(
@@ -119,9 +119,9 @@ impl Plugin for FxaaPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app.init_resource::<FxaaPipeline>();
     }
 }

crates/bevy_anti_aliasing/src/smaa/mod.rs

@@ -339,9 +339,9 @@ impl Plugin for SmaaPlugin {
         app.add_plugins(ExtractComponentPlugin::<Smaa>::default())
             .register_type::<Smaa>();
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<SmaaSpecializedRenderPipelines>()
@@ -376,9 +376,10 @@ impl Plugin for SmaaPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.init_resource::<SmaaPipelines>();
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app.init_resource::<SmaaPipelines>();
     }
 }
 

crates/bevy_anti_aliasing/src/taa/mod.rs

@@ -53,9 +53,9 @@ impl Plugin for TemporalAntiAliasPlugin {
 
         app.add_plugins(SyncComponentPlugin::<TemporalAntiAliasing>::default());
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<SpecializedRenderPipelines<TaaPipeline>>()
             .add_systems(ExtractSchedule, extract_taa_settings)
@@ -81,9 +81,9 @@ impl Plugin for TemporalAntiAliasPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<TaaPipeline>();
     }

crates/bevy_core_pipeline/src/auto_exposure/mod.rs

@@ -54,9 +54,9 @@ impl Plugin for AutoExposurePlugin {
         app.register_type::<AutoExposure>();
         app.add_plugins(ExtractComponentPlugin::<AutoExposure>::default());
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<SpecializedComputePipelines<AutoExposurePipeline>>()
@@ -77,9 +77,9 @@ impl Plugin for AutoExposurePlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<AutoExposurePipeline>();
         render_app.init_resource::<AutoExposureResources>();

crates/bevy_core_pipeline/src/blit/mod.rs

@@ -19,15 +19,16 @@ impl Plugin for BlitPlugin {
     fn build(&self, app: &mut App) {
         embedded_asset!(app, "blit.wgsl");
 
-        if let Some(render_app) = app.get_sub_app_mut(RenderApp) {
-            render_app.allow_ambiguous_resource::<SpecializedRenderPipelines<BlitPipeline>>();
-        }
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
+        render_app.allow_ambiguous_resource::<SpecializedRenderPipelines<BlitPipeline>>();
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<BlitPipeline>()
             .init_resource::<SpecializedRenderPipelines<BlitPipeline>>();

crates/bevy_core_pipeline/src/bloom/mod.rs

@@ -53,9 +53,9 @@ impl Plugin for BloomPlugin {
             UniformComponentPlugin::<BloomUniforms>::default(),
         ));
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<SpecializedRenderPipelines<BloomDownsamplingPipeline>>()
             .init_resource::<SpecializedRenderPipelines<BloomUpsamplingPipeline>>()
@@ -83,9 +83,9 @@ impl Plugin for BloomPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<BloomDownsamplingPipeline>()
             .init_resource::<BloomUpsamplingPipeline>();

crates/bevy_core_pipeline/src/core_2d/mod.rs

@@ -80,9 +80,9 @@ impl Plugin for Core2dPlugin {
         app.register_type::<Camera2d>()
             .add_plugins(ExtractComponentPlugin::<Camera2d>::default());
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<DrawFunctions<Opaque2d>>()
             .init_resource::<DrawFunctions<AlphaMask2d>>()

crates/bevy_core_pipeline/src/core_3d/mod.rs

@@ -142,9 +142,9 @@ impl Plugin for Core3dPlugin {
             .add_plugins((SkyboxPlugin, ExtractComponentPlugin::<Camera3d>::default()))
             .add_systems(PostUpdate, check_msaa);
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app
             .init_resource::<DrawFunctions<Opaque3d>>()
             .init_resource::<DrawFunctions<AlphaMask3d>>()

crates/bevy_core_pipeline/src/deferred/copy_lighting_id.rs

@@ -28,19 +28,19 @@ pub struct CopyDeferredLightingIdPlugin;
 impl Plugin for CopyDeferredLightingIdPlugin {
     fn build(&self, app: &mut App) {
         embedded_asset!(app, "copy_deferred_lighting_id.wgsl");
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app.add_systems(
             Render,
             (prepare_deferred_lighting_id_textures.in_set(RenderSystems::PrepareResources),),
         );
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<CopyDeferredLightingIdPipeline>();
     }

crates/bevy_core_pipeline/src/dof/mod.rs

@@ -212,9 +212,9 @@ impl Plugin for DepthOfFieldPlugin {
 
         app.add_plugins(SyncComponentPlugin::<DepthOfField>::default());
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<SpecializedRenderPipelines<DepthOfFieldPipeline>>()
@@ -250,9 +250,9 @@ impl Plugin for DepthOfFieldPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<DepthOfFieldGlobalBindGroupLayout>();
     }

crates/bevy_core_pipeline/src/experimental/mip_generation/mod.rs

@@ -75,9 +75,9 @@ impl Plugin for MipGenerationPlugin {
             Shader::from_wgsl
         );
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<SpecializedComputePipelines<DownsampleDepthPipeline>>()
@@ -119,9 +119,9 @@ impl Plugin for MipGenerationPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app.init_resource::<DepthPyramidDummyTexture>();
     }
 }

crates/bevy_core_pipeline/src/lib.rs

@@ -84,9 +84,9 @@ impl Plugin for CorePipelinePlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app.init_resource::<FullscreenShader>();
     }
 }

crates/bevy_core_pipeline/src/motion_blur/mod.rs

@@ -137,9 +137,9 @@ impl Plugin for MotionBlurPlugin {
             UniformComponentPlugin::<MotionBlurUniform>::default(),
         ));
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app
             .init_resource::<SpecializedRenderPipelines<pipeline::MotionBlurPipeline>>()
@@ -164,9 +164,9 @@ impl Plugin for MotionBlurPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<pipeline::MotionBlurPipeline>();
     }

crates/bevy_core_pipeline/src/msaa_writeback.rs

@@ -21,9 +21,9 @@ pub struct MsaaWritebackPlugin;
 
 impl Plugin for MsaaWritebackPlugin {
     fn build(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
         render_app.add_systems(
             Render,
             prepare_msaa_writeback_pipelines.in_set(RenderSystems::Prepare),

crates/bevy_core_pipeline/src/oit/mod.rs

@@ -109,9 +109,9 @@ impl Plugin for OrderIndependentTransparencyPlugin {
         .add_systems(Last, configure_depth_texture_usages)
         .register_type::<OrderIndependentTransparencySettings>();
 
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.add_systems(
             Render,
@@ -131,9 +131,9 @@ impl Plugin for OrderIndependentTransparencyPlugin {
     }
 
     fn finish(&self, app: &mut App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         render_app.init_resource::<OitBuffers>();
     }

crates/bevy_core_pipeline/src/oit/resolve/mod.rs

@@ -37,9 +37,9 @@ impl Plugin for OitResolvePlugin {
     }
 
     fn finish(&self, app: &mut bevy_app::App) {
-        let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
-            return;
-        };
+        let render_app = app
+            .get_sub_app_mut(RenderApp)
+            .expect("RenderPlugin has not been added");
 
         if !is_oit_supported(
             render_app.world().resource::<RenderAdapter>(),