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

potential fix for level loading hangs with White Box Component and Atom

Browse Source
This commit is contained in:
hultonha
2021-05-05 16:08:38 +01:00
parent cec56d7b27
commit b708bc2c10
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp
+10 -3
View File
@@ -119,9 +119,16 @@ namespace WhiteBox
modelLodCreator.BeginMesh();
modelLodCreator.SetMeshAabb(meshData.GetAabb());
// set the default material
auto materialAsset =
AZ::RPI::AssetUtils::LoadAssetByProductPath<AZ::RPI::MaterialAsset>(TexturedMaterialPath.data());
const AZ::Data::AssetId materialAssetId =
AZ::RPI::AssetUtils::GetAssetIdForProductPath(TexturedMaterialPath.data(), AZ::RPI::AssetUtils::TraceLevel::Warning);
auto materialAsset = AZ::Data::AssetManager::Instance().FindAsset(materialAssetId, AZ::Data::AssetLoadBehavior::Default);
if (!materialAsset)
{
// set the default material
materialAsset = AZ::RPI::AssetUtils::LoadAssetById<AZ::RPI::MaterialAsset>(materialAssetId);
}
if (materialAsset)
{
modelLodCreator.SetMeshMaterialAsset(materialAsset);