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

Fix collider component validation function by checking if the asset is ready (#5795)

Browse Source 
Signed-off-by: moraaar <moraaar@amazon.com>
monroegm-disable-blank-issue-2
moraaar 4 years ago committed by GitHub
parent 5145fceedc
commit bcce0678c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

6
Gems/PhysX/Code/Source/EditorColliderComponent.cpp
Unescape Escape View File

@ -760,7 +760,7 @@ namespace PhysX
if (asset == m_shapeConfiguration.m_physicsAsset.m_pxAsset) if (asset == m_shapeConfiguration.m_physicsAsset.m_pxAsset)
{ {
m_shapeConfiguration.m_physicsAsset.m_pxAsset = asset; m_shapeConfiguration.m_physicsAsset.m_pxAsset = asset;
m_shapeConfiguration.m_physicsAsset.m_configuration.m_asset = m_shapeConfiguration.m_physicsAsset.m_pxAsset; m_shapeConfiguration.m_physicsAsset.m_configuration.m_asset = asset;
UpdateMaterialSlotsFromMeshAsset(); UpdateMaterialSlotsFromMeshAsset();
CreateStaticEditorCollider(); CreateStaticEditorCollider();
@ -785,7 +785,9 @@ namespace PhysX
{ {
const PhysX::EditorRigidBodyComponent* entityRigidbody = m_entity->FindComponent<PhysX::EditorRigidBodyComponent>(); const PhysX::EditorRigidBodyComponent* entityRigidbody = m_entity->FindComponent<PhysX::EditorRigidBodyComponent>();
if (m_shapeConfiguration.m_physicsAsset.m_pxAsset && (m_shapeConfiguration.m_shapeType == Physics::ShapeType::PhysicsAsset) && entityRigidbody) if (entityRigidbody &&
m_shapeConfiguration.m_shapeType == Physics::ShapeType::PhysicsAsset &&
m_shapeConfiguration.m_physicsAsset.m_pxAsset.IsReady())
{ {
AZStd::vector<AZStd::shared_ptr<Physics::Shape>> shapes; AZStd::vector<AZStd::shared_ptr<Physics::Shape>> shapes;
Utils::GetShapesFromAsset(m_shapeConfiguration.m_physicsAsset.m_configuration, m_configuration, m_hasNonUniformScale, Utils::GetShapesFromAsset(m_shapeConfiguration.m_physicsAsset.m_configuration, m_configuration, m_hasNonUniformScale,

Write Preview
Loading…
Cancel
Save