From 498e5b738f935569b5b770bfbcefd9c75b9b32b8 Mon Sep 17 00:00:00 2001 From: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> Date: Wed, 26 Jan 2022 16:40:53 -0800 Subject: [PATCH] Removed SetAutoLoadBehavior from InMemorySpawnableAssetContainer. These calls didn't have any practical effect and created confusion, so they were removed. Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> --- .../Prefab/Spawnable/InMemorySpawnableAssetContainer.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/InMemorySpawnableAssetContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/InMemorySpawnableAssetContainer.cpp index a927f60789..f0fbd1a299 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/InMemorySpawnableAssetContainer.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/InMemorySpawnableAssetContainer.cpp @@ -259,9 +259,6 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils { // Only assets that are preloaded need to be waited on. blockingAssets.push_back(asset); - // Queue any pending request in parallel. Assets that were set to PreLoad will be waited for resulting - // in the same overall load guarantees. - asset->SetAutoLoadBehavior(AZ::Data::AssetLoadBehavior::QueueLoad); } if (!asset->QueueLoad()) { @@ -297,10 +294,6 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils continue; } - - // Reset the load behavior back to preload because the async load will have caused the behavior to be set to queued. Some assets - // will complain if they're not set to the correct loading behavior. - asset->SetAutoLoadBehavior(AZ::Data::AssetLoadBehavior::PreLoad); } } } // namespace AzToolsFramework::Prefab::PrefabConversionUtils