From fd007548e00f30bb4d5c705178e6bbef34d02013 Mon Sep 17 00:00:00 2001
From: dmcdiar <dmcdiar@amazon.com>
Date: Tue, 7 Sep 2021 12:16:04 -0700
Subject: [PATCH] MeshFeatureProcessor::SetVisible now adds or removes the mesh
 from the raytracing scene as appropriate.

Signed-off-by: dmcdiar <dmcdiar@amazon.com>
---
 .../Common/Code/Source/Mesh/MeshFeatureProcessor.cpp      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
index f52d9fe37c..67702a8176 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
@@ -425,6 +425,7 @@ namespace AZ
             if (meshHandle.IsValid())
             {
                 meshHandle->SetVisible(visible);
+                SetRayTracingEnabled(meshHandle, visible);
             }
         }
 
@@ -696,8 +697,13 @@ namespace AZ
 
         void MeshDataInstance::SetRayTracingData()
         {
+            if (!m_model)
+            {
+                return;
+            }
+
             RayTracingFeatureProcessor* rayTracingFeatureProcessor = m_scene->GetFeatureProcessor<RayTracingFeatureProcessor>();
-            if (rayTracingFeatureProcessor == nullptr)
+            if (!rayTracingFeatureProcessor)
             {
                 return;
             }