diff --git a/crates/bevy_pbr/src/material.rs b/crates/bevy_pbr/src/material.rs index 0deef73a9cd2e..a9c7895781665 100644 --- a/crates/bevy_pbr/src/material.rs +++ b/crates/bevy_pbr/src/material.rs @@ -282,12 +282,18 @@ where #[cfg(feature = "meshlet")] render_app.add_systems( Render, - ( - prepare_material_meshlet_meshes_main_opaque_pass::, - queue_material_meshlet_meshes::, - ) - .chain() - .in_set(RenderSet::Queue) + queue_material_meshlet_meshes:: + .in_set(RenderSet::QueueMeshes) + .run_if(resource_exists::), + ); + + #[cfg(feature = "meshlet")] + render_app.add_systems( + Render, + prepare_material_meshlet_meshes_main_opaque_pass:: + .in_set(RenderSet::QueueMeshes) + .after(prepare_assets::>) + .before(queue_material_meshlet_meshes::) .run_if(resource_exists::), ); } diff --git a/crates/bevy_pbr/src/prepass/mod.rs b/crates/bevy_pbr/src/prepass/mod.rs index 56ee5a86efa22..9189830e74d90 100644 --- a/crates/bevy_pbr/src/prepass/mod.rs +++ b/crates/bevy_pbr/src/prepass/mod.rs @@ -184,7 +184,8 @@ where render_app.add_systems( Render, prepare_material_meshlet_meshes_prepass:: - .in_set(RenderSet::Queue) + .in_set(RenderSet::QueueMeshes) + .after(prepare_assets::>) .before(queue_material_meshlet_meshes::) .run_if(resource_exists::), );