birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved Serialize Context retrieval out of a loop and expanded an error message in InMemorySpawnableAssetContainer::LoadReferencedAssets.

Browse Source 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
This commit is contained in:
AMZN-koppersr
2022-01-27 09:47:12 -08:00
parent 498e5b738f
commit 94919fe270
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Spawnable/InMemorySpawnableAssetContainer.cpp
+8 -6
View File
@@ -219,13 +219,12 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
// 2. Gets the exact asset to load to avoid issues with assets that don't reload.
AZStd::vector<AZ::Data::Asset<AZ::Data::AssetData>*> blockingAssets;
AZ::SerializeContext* sc = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(sc, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
AZ_Assert(sc, "Unable to locate Serialize Context while resolving asset references in the in-memory spawnable asset container.");
for (AZ::Data::Asset<AZ::Data::AssetData>& asset : spawnable.m_assets)
{
AZ::SerializeContext* sc = nullptr;
AZ::ComponentApplicationBus::BroadcastResult(sc, &AZ::ComponentApplicationBus::Events::GetSerializeContext);
AZ_Assert(
sc, "Unable to locate Serialize Context while resolving asset references in the in-memory spawnable asset container.");
auto callback = [&blockingAssets](
void* object, const AZ::SerializeContext::ClassData* classData,
[[maybe_unused]]const AZ::SerializeContext::ClassElement* elementData) -> bool
@@ -236,7 +235,10 @@ namespace AzToolsFramework::Prefab::PrefabConversionUtils
if (!asset->GetId().IsValid())
{
AZ_Error("Prefab", false, "Invalid asset found referenced in scene while entering game mode");
AZ_Error(
"Prefab", false,
"Invalid asset found referenced in scene while entering game mode. The asset was stored in an instance of %s.",
classData->m_name);
return false;
}