Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -104,9 +104,11 @@ namespace PhysX
                PhysX::PhysXScene* physxScene = nullptr;
                if (auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get())
                {
-                    if (scene = physicsSystem->GetScene(sceneHandle))
+                    scene = physicsSystem->GetScene(sceneHandle);
+                    if (scene)
                    {
-                        if (physxScene = azrtti_cast<PhysX::PhysXScene*>(scene))
+                        physxScene = azrtti_cast<PhysX::PhysXScene*>(scene);
+                        if (physxScene)
                        {
                            manager = physxScene->GetOrCreateControllerManager();
                        }