Merge pull request #6050 from aws-lumberyard-dev/daimini/physicsMaterialNameCrash

Add additional check to ensure material library is loaded when trying to retrieve names.
2021-12-03 11:25:25 +00:00
parent cfb426b86c 5c4f287b79
commit 8f4ff91915
2 changed files with 3 additions and 1 deletions
@@ -864,7 +864,8 @@ namespace PhysX
        {
            if (auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get())
            {
-                if (const auto* physicsConfiguration = physicsSystem->GetConfiguration())
+                if (const auto* physicsConfiguration = physicsSystem->GetConfiguration();
+                    physicsConfiguration && physicsConfiguration->m_materialLibraryAsset)
                {
                    const auto& materials = physicsConfiguration->m_materialLibraryAsset->GetMaterialsData();

@@ -457,6 +457,7 @@
                "RC physmaterial": {
                    "glob": "*.physmaterial",
                    "params": "copy",
+                    "critical": "true",
                    "productAssetType": "{9E366D8C-33BB-4825-9A1F-FA3ADBE11D0F}"
                },
                "RC ocm": {