Merge branch stabilization/2110 into development

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-11-04 11:10:27 -07:00
parent bb1dfd44d2 6763e2a3ac
commit 69059ba3e6
13 changed files with 80 additions and 125 deletions
@@ -294,7 +294,7 @@ namespace AZ
        void PassLibrary::OnAssetReloaded(Data::Asset<Data::AssetData> asset)
        {
            // Handle pass asset reload
-            Data::Asset<PassAsset> passAsset = { asset.GetAs<PassAsset>(), AZ::Data::AssetLoadBehavior::PreLoad };
+            Data::Asset<PassAsset> passAsset = Data::static_pointer_cast<PassAsset>(asset);
            if (passAsset && passAsset->GetPassTemplate())
            {
                LoadPassAsset(passAsset->GetPassTemplate()->m_name, passAsset, true);