Merge branch 'main' into Atom/dmcdiar/ATOM-14933

2021-05-07 17:12:27 -07:00
parent 2e1c4e52d3 4c453bf4b6
commit 071ecb7db7
1400 changed files with 32448 additions and 65581 deletions
@@ -244,9 +244,10 @@ namespace AZ
            m_updateSrg = true;
        }

-        void ReflectionProbe::SetCubeMapImage(const Data::Instance<RPI::Image>& cubeMapImage)
+        void ReflectionProbe::SetCubeMapImage(const Data::Instance<RPI::Image>& cubeMapImage, const AZStd::string& relativePath)
        {
            m_cubeMapImage = cubeMapImage;
+            m_cubeMapRelativePath = relativePath;
            m_updateSrg = true;
        }