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

Merge branch 'development' into cmake/SPEC-2513_w4244

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
This commit is contained in:
Esteban Papp
2021-08-17 12:10:46 -07:00
parent b1444828ff fb05beffe3
commit 036114a5a7
121 changed files with 2601 additions and 2341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/SceneProcessing/Code/Source/SceneBuilder/SceneSerializationHandler.cpp
+4 -2
View File
@@ -19,6 +19,7 @@
#include <AzToolsFramework/Debug/TraceContext.h>
#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
#include <SceneAPI/SceneCore/Utilities/Reporting.h>
#include <SceneAPI/SceneCore/Components/LoadingComponent.h>
namespace SceneBuilder
{
@@ -79,8 +80,9 @@ namespace SceneBuilder
return nullptr;
}
AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene> scene =
AssetImportRequest::LoadSceneFromVerifiedPath(filePath, sceneSourceGuid, AssetImportRequest::RequestingApplication::AssetProcessor);
AZStd::shared_ptr<AZ::SceneAPI::Containers::Scene> scene = AssetImportRequest::LoadSceneFromVerifiedPath(
filePath, sceneSourceGuid, AssetImportRequest::RequestingApplication::AssetProcessor,
AZ::SceneAPI::SceneCore::LoadingComponent::TYPEINFO_Uuid());
if (!scene)
{