Merge branch 'stabilization/2110' into Atom/dmcdiar/ATOM-16247

2021-11-08 16:44:35 -07:00
parent fe005c9c50 dcc2890da3
commit be934a4b32
387 changed files with 5302 additions and 3200 deletions
@@ -191,7 +191,7 @@ namespace AZ
                    if (notificationType == CubeMapAssetNotificationType::Ready)
                    {
                        // bake is complete, update configuration with the new baked cubemap asset
-                        m_controller.m_configuration.m_bakedCubeMapAsset = { cubeMapAsset.GetAs<RPI::StreamingImageAsset>(), AZ::Data::AssetLoadBehavior::PreLoad };
+                        m_controller.m_configuration.m_bakedCubeMapAsset = cubeMapAsset;

                        // refresh the currently rendered cubemap
                        m_controller.UpdateCubeMap();