Fix merge issues

Author: tim-blackbird

crates/bevy_core_pipeline/src/gizmo_2d/mod.rs

@@ -1,4 +1,4 @@
-use bevy_app::Plugin;
+use bevy_app::{IntoSystemAppConfig, Plugin};
 use bevy_ecs::{
     prelude::Entity,
     query::With,
@@ -31,7 +31,7 @@ impl Plugin for Gizmo2dPlugin {
         render_app
             .init_resource::<DrawFunctions<GizmoLine2d>>()
             .add_system(sort_phase_system::<GizmoLine2d>)
-            .add_system_to_schedule(ExtractSchedule, extract_gizmo_line_2d_camera_phase);
+            .add_system(extract_gizmo_line_2d_camera_phase.in_schedule(ExtractSchedule));
 
         let gizmo_node = Gizmo2dNode::new(&mut render_app.world);
         let mut binding = render_app.world.resource_mut::<RenderGraph>();

crates/bevy_core_pipeline/src/gizmo_3d/mod.rs

@@ -1,6 +1,6 @@
 use std::cmp::Reverse;
 
-use bevy_app::Plugin;
+use bevy_app::{IntoSystemAppConfig, Plugin};
 use bevy_ecs::{
     prelude::Entity,
     query::With,
@@ -34,7 +34,7 @@ impl Plugin for Gizmo3dPlugin {
         render_app
             .init_resource::<DrawFunctions<GizmoLine3d>>()
             .add_system(sort_phase_system::<GizmoLine3d>)
-            .add_system_to_schedule(ExtractSchedule, extract_gizmo_line_3d_camera_phase);
+            .add_system(extract_gizmo_line_3d_camera_phase.in_schedule(ExtractSchedule));
 
         let gizmo_node = Gizmo3dNode::new(&mut render_app.world);
         let mut binding = render_app.world.resource_mut::<RenderGraph>();

crates/bevy_gizmos/src/lib.rs

@@ -1,6 +1,6 @@
 use std::mem;
 
-use bevy_app::{CoreSet, Plugin};
+use bevy_app::{CoreSet, IntoSystemAppConfig, Plugin};
 use bevy_asset::{load_internal_asset, Assets, Handle, HandleUntyped};
 use bevy_core_pipeline::{
     gizmo_2d::{Gizmo2dPlugin, GizmoLine2d},
@@ -63,7 +63,7 @@ impl Plugin for GizmoPlugin {
 
         let Ok(render_app) = app.get_sub_app_mut(RenderApp) else { return; };
 
-        render_app.add_system_to_schedule(ExtractSchedule, extract_gizmo_data);
+        render_app.add_system(extract_gizmo_data.in_schedule(ExtractSchedule));
 
         #[cfg(feature = "bevy_sprite")]
         {

crates/bevy_gizmos/src/pipeline_2d.rs

@@ -64,7 +64,7 @@ impl SpecializedMeshPipeline for GizmoPipeline2d {
                     write_mask: ColorWrites::ALL,
                 })],
             }),
-            layout: Some(vec![self.mesh_pipeline.view_layout.clone()]),
+            layout: vec![self.mesh_pipeline.view_layout.clone()],
             primitive: PrimitiveState {
                 front_face: FrontFace::Ccw,
                 cull_mode: None,
@@ -80,6 +80,7 @@ impl SpecializedMeshPipeline for GizmoPipeline2d {
                 mask: !0,
                 alpha_to_coverage_enabled: false,
             },
+            push_constant_ranges: vec![],
             label: None,
         })
     }

crates/bevy_gizmos/src/pipeline_3d.rs

@@ -110,7 +110,7 @@ impl SpecializedMeshPipeline for GizmoPipeline3d {
                     write_mask: ColorWrites::ALL,
                 })],
             }),
-            layout: Some(bind_group_layout),
+            layout: bind_group_layout,
             primitive: PrimitiveState {
                 front_face: FrontFace::Ccw,
                 cull_mode: None,
@@ -141,6 +141,7 @@ impl SpecializedMeshPipeline for GizmoPipeline3d {
                 mask: !0,
                 alpha_to_coverage_enabled: false,
             },
+            push_constant_ranges: vec![],
             label: Some(label),
         })
     }

examples/3d/3d_gizmos.rs

@@ -25,7 +25,7 @@ fn setup(
 
     // plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(shape::Plane { size: 5.0 })),
+        mesh: meshes.add(Mesh::from(shape::Plane::from_size(5.0))),
         material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
         ..default()
     });