Merge branch 'development' into cmake/SPEC-7484

2021-08-10 14:30:07 -07:00
parent 3b9044ce5d c484e685d1
commit 2147b1d128
153 changed files with 5217 additions and 2016 deletions
@@ -703,7 +703,7 @@ namespace PhysXDebug
        if (GetCurrentPxScene())
        {
            // Reserve vector capacity
-            const int numTriangles = rb.getNbTriangles();
+            const physx::PxU32 numTriangles = static_cast<physx::PxU32>(rb.getNbTriangles());
            m_trianglePoints.reserve(numTriangles * 3);
            m_triangleColors.reserve(numTriangles * 3);

@@ -737,7 +737,7 @@ namespace PhysXDebug

        if (GetCurrentPxScene())
        {
-            const int numLines = rb.getNbLines();
+            const physx::PxU32 numLines = static_cast<physx::PxU32>(rb.getNbLines());

            // Reserve vector capacity
            m_linePoints.reserve(numLines * 2);