Integrating latest 47acbe8

This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
@@ -182,8 +182,7 @@ namespace ScriptEventsBuilder
AZ_TracePrintf(s_scriptEventsBuilder, "Script Events Asset preload\n");
AZ::Data::Asset<ScriptEvents::ScriptEventsAsset> asset;
asset.Create(AZ::Data::AssetId(AZ::Uuid::CreateRandom()));
asset.Create(request.m_sourceFileUUID);
if (editorAssetHandler->LoadAssetData(asset, assetDataStream, nullptr) != AZ::Data::AssetHandler::LoadResult::LoadComplete)
{
AZ_Error(s_scriptEventsBuilder, false, R"(Loading of ScriptEvents asset for source file "%s" has failed)", fullPath.data());
@@ -206,7 +205,7 @@ namespace ScriptEventsBuilder
AZ::IO::ByteContainerStream<decltype(byteBuffer)> byteStream(&byteBuffer);
AZ::Data::Asset<ScriptEvents::ScriptEventsAsset> productionAsset;
productionAsset.Create(AZ::Uuid::CreateRandom());
productionAsset.Create(request.m_sourceFileUUID);
productionAsset.Get()->m_definition = AZStd::move(definition);
editorAssetHandler->SetSaveAsBinary(true);