From 49ebb8d247bbaeaa115b7cf6cb04621ec752742f Mon Sep 17 00:00:00 2001 From: Torstein Grindvik Date: Mon, 30 Jan 2023 17:32:12 +0100 Subject: [PATCH] Rebase stuff. Signed-off-by: Torstein Grindvik --- crates/bevy_pbr/src/render/mesh.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs index ccee598163308..dc6a0c65110d9 100644 --- a/crates/bevy_pbr/src/render/mesh.rs +++ b/crates/bevy_pbr/src/render/mesh.rs @@ -1,8 +1,9 @@ use crate::{ - FogMeta, GlobalLightMeta, GpuFog, GpuLights, GpuPointLights, LightMeta, NotShadowCaster, - NotShadowReceiver, ShadowPipeline, ViewClusterBindings, ViewFogUniformOffset, - ViewLightsUniformOffset, ViewShadowBindings, CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT, - MAX_CASCADES_PER_LIGHT, MAX_DIRECTIONAL_LIGHTS, PBR_SHADER_HANDLE, + FogMeta, GlobalLightMeta, GpuFog, GpuLights, GpuPointLights, LightMeta, Material, + MaterialPipeline, NotShadowCaster, NotShadowReceiver, ShadowPipeline, StandardMaterial, + ViewClusterBindings, ViewFogUniformOffset, ViewLightsUniformOffset, ViewShadowBindings, + CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT, MAX_CASCADES_PER_LIGHT, MAX_DIRECTIONAL_LIGHTS, + PBR_SHADER_HANDLE, }; use bevy_app::Plugin; use bevy_asset::{load_internal_asset, Assets, Handle, HandleUntyped};