From dc8f9dc233b3819a5c4e6c2e0de273e635213c60 Mon Sep 17 00:00:00 2001 From: moraaar Date: Mon, 6 Dec 2021 13:26:23 +0000 Subject: [PATCH] Add additional check to check material library is loaded when trying to retrieve names (#6165) * Add additional check to ensure material library is loaded when trying to retrieve names. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> * Mark physmaterial assets as critical Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Co-authored-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Signed-off-by: moraaar moraaar@amazon.com --- Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp | 3 ++- Registry/AssetProcessorPlatformConfig.setreg | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp index d0ff4008b2..24bfeef1be 100644 --- a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp +++ b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp @@ -864,7 +864,8 @@ namespace PhysX { if (auto* physicsSystem = AZ::Interface::Get()) { - if (const auto* physicsConfiguration = physicsSystem->GetConfiguration()) + if (const auto* physicsConfiguration = physicsSystem->GetConfiguration(); + physicsConfiguration && physicsConfiguration->m_materialLibraryAsset) { const auto& materials = physicsConfiguration->m_materialLibraryAsset->GetMaterialsData(); diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg index ddc465c201..7c52feb10b 100644 --- a/Registry/AssetProcessorPlatformConfig.setreg +++ b/Registry/AssetProcessorPlatformConfig.setreg @@ -442,6 +442,7 @@ "RC physmaterial": { "glob": "*.physmaterial", "params": "copy", + "critical": "true", "productAssetType": "{9E366D8C-33BB-4825-9A1F-FA3ADBE11D0F}" }, "RC ocm": {