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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Prefab/PrefabBuilder/PrefabBuilderComponent.cpp
+5 -16
View File
@@ -79,23 +79,12 @@ namespace AZ::Prefab
AzToolsFramework::Fingerprinting::TypeFingerprint fingerprint = m_pipeline.GetFingerprint();
// Deserialize all of the entities and their components (for this prefab only)
AzToolsFramework::Prefab::Instance::AliasToEntityMap entities;
auto entitiesIterator = genericDocument.FindMember(AzToolsFramework::Prefab::PrefabDomUtils::EntitiesName);
if (entitiesIterator != genericDocument.MemberEnd())
auto newInstance = AZStd::make_unique<AzToolsFramework::Prefab::Instance>();
AzToolsFramework::Prefab::Instance::EntityList entities;
if (AzToolsFramework::Prefab::PrefabDomUtils::LoadInstanceFromPrefabDom(*newInstance, entities, genericDocument))
{
auto&& entitiesJson = entitiesIterator->value;
if (entitiesJson.IsObject())
{
JsonSerializationResult::ResultCode result = AZ::JsonSerialization::Load(entities, entitiesJson);
if (result.GetProcessing() != JsonSerializationResult::Processing::Halted)
{
// Add the fingerprint of all the components and their types
AZStd::hash_combine(fingerprint, m_typeFingerprinter->GenerateFingerprintForAllTypesInObject(&entities));
}
}
// Add the fingerprint of all the components and their types
AZStd::hash_combine(fingerprint, m_typeFingerprinter->GenerateFingerprintForAllTypesInObject(&entities));
}
return fingerprint;