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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/PhysX/Code/Source/SystemComponent.cpp
+3 -2
View File
@@ -466,7 +466,7 @@ namespace PhysX
void SystemComponent::AddColliderComponentToEntity(AZ::Entity* entity, const Physics::ColliderConfiguration& colliderConfiguration, const Physics::ShapeConfiguration& shapeConfiguration, [[maybe_unused]] bool addEditorComponents)
{
Physics::ShapeType shapeType = shapeConfiguration.GetShapeType();
[[maybe_unused]] Physics::ShapeType shapeType = shapeConfiguration.GetShapeType();
#ifdef PHYSX_EDITOR
if (addEditorComponents)
@@ -664,7 +664,8 @@ namespace PhysX
void SystemComponent::ActivatePhysXSystem()
{
if (m_physXSystem = GetPhysXSystem())
m_physXSystem = GetPhysXSystem();
if (m_physXSystem)
{
m_physXSystem->RegisterSystemInitializedEvent(m_onSystemInitializedHandler);
m_physXSystem->RegisterSystemConfigurationChangedEvent(m_onSystemConfigChangedHandler);