From 7d611c1f8ae4844a139281aa9a560a533b3475df Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:00:42 -0800 Subject: [PATCH 1/2] 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> --- Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp | 3 ++- 1 file changed, 2 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(); From 5c4f287b79dd4827e54bbad7ed8f8c0ea7576320 Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Thu, 2 Dec 2021 16:44:29 -0800 Subject: [PATCH 2/2] Mark physmaterial assets as critical Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- Registry/AssetProcessorPlatformConfig.setreg | 1 + 1 file changed, 1 insertion(+) 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": {