Merged stabilization/2106 to development; Resolved merge conflicts

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00
parent 504201aef2 7cfde884d9
commit e924ed0b86
221 changed files with 2398 additions and 9445 deletions
@@ -266,6 +266,10 @@ namespace AZ
        {
            AZ_Assert(probe.get(), "SetProbeCubeMap called with an invalid handle");
            probe->SetCubeMapImage(cubeMapImage, relativePath);
+
+            // notify the MeshFeatureProcessor that the reflection probe changed
+            MeshFeatureProcessor* meshFeatureProcessor = GetParentScene()->GetFeatureProcessor<MeshFeatureProcessor>();
+            meshFeatureProcessor->UpdateMeshReflectionProbes();
        }

        void ReflectionProbeFeatureProcessor::SetProbeTransform(const ReflectionProbeHandle& probe, const AZ::Transform& transform)