From 2ac290dd8f61e1dd804dd918a564a1a44e7d1499 Mon Sep 17 00:00:00 2001
From: andristarr <andristarr@gmail.com>
Date: Wed, 29 May 2024 15:50:28 +0200
Subject: [PATCH] Swapping back to using From<Color> for StandardMaterial in
 examples (#13566)

# Objective

Fixes #13547
---
 examples/3d/3d_scene.rs             | 10 ++--------
 examples/3d/3d_viewport_to_world.rs |  5 +----
 examples/3d/anti_aliasing.rs        |  5 +----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/examples/3d/3d_scene.rs b/examples/3d/3d_scene.rs
index df3b226732..9b57373ec7 100644
--- a/examples/3d/3d_scene.rs
+++ b/examples/3d/3d_scene.rs
@@ -18,20 +18,14 @@ fn setup(
     // circular base
     commands.spawn(PbrBundle {
         mesh: meshes.add(Circle::new(4.0)),
-        material: materials.add(StandardMaterial {
-            base_color: Color::WHITE,
-            ..Default::default()
-        }),
+        material: materials.add(Color::WHITE),
         transform: Transform::from_rotation(Quat::from_rotation_x(-std::f32::consts::FRAC_PI_2)),
         ..default()
     });
     // cube
     commands.spawn(PbrBundle {
         mesh: meshes.add(Cuboid::new(1.0, 1.0, 1.0)),
-        material: materials.add(StandardMaterial {
-            base_color: Srgba::rgb_u8(124, 144, 255).into(),
-            ..Default::default()
-        }),
+        material: materials.add(Color::srgb_u8(124, 144, 255)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..default()
     });
diff --git a/examples/3d/3d_viewport_to_world.rs b/examples/3d/3d_viewport_to_world.rs
index 12e12c475f..9e4e4f73da 100644
--- a/examples/3d/3d_viewport_to_world.rs
+++ b/examples/3d/3d_viewport_to_world.rs
@@ -52,10 +52,7 @@ fn setup(
     commands.spawn((
         PbrBundle {
             mesh: meshes.add(Plane3d::default().mesh().size(20., 20.)),
-            material: materials.add(StandardMaterial {
-                base_color: LinearRgba::rgb(0.3, 0.5, 0.3).into(),
-                ..default()
-            }),
+            material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
             ..default()
         },
         Ground,
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
index 107c3e4f31..fc698733e3 100644
--- a/examples/3d/anti_aliasing.rs
+++ b/examples/3d/anti_aliasing.rs
@@ -261,10 +261,7 @@ fn setup(
     // Plane
     commands.spawn(PbrBundle {
         mesh: meshes.add(Plane3d::default().mesh().size(50.0, 50.0)),
-        material: materials.add(StandardMaterial {
-            base_color: LinearRgba::rgb(0.1, 0.2, 0.1).into(),
-            ..Default::default()
-        }),
+        material: materials.add(Color::srgb(0.1, 0.2, 0.1)),
         ..default()
     });