From 8b1eb0d7eadd9ad260bffa254442e6103db11a90 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Sat, 28 Aug 2021 15:59:22 +0200
Subject: [PATCH] bevy_pbr2: Fixes for MSAA after rebasing

---
 pipelined/bevy_pbr2/src/render/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pipelined/bevy_pbr2/src/render/mod.rs b/pipelined/bevy_pbr2/src/render/mod.rs
index c97446d1ea6e19..198136fc2dbbc5 100644
--- a/pipelined/bevy_pbr2/src/render/mod.rs
+++ b/pipelined/bevy_pbr2/src/render/mod.rs
@@ -26,6 +26,7 @@ use wgpu::{
 };
 
 pub struct PbrShaders {
+    shader_module: ShaderModule,
     pipeline: RenderPipeline,
     view_layout: BindGroupLayout,
     material_layout: BindGroupLayout,
@@ -290,6 +291,7 @@ impl FromWorld for PbrShaders {
             }
         };
         PbrShaders {
+            shader_module,
             pipeline,
             view_layout,
             material_layout,
@@ -511,8 +513,8 @@ pub fn prepare_pbr(
             push_constant_ranges: &[],
             bind_group_layouts: &[
                 &pbr_shaders.view_layout,
-                &pbr_shaders.mesh_layout,
                 &pbr_shaders.material_layout,
+                &pbr_shaders.mesh_layout,
             ],
         });
         pbr_shaders.pipeline = create_render_pipeline(