Merge commit '057c8e0d4e77c6ede25359a86324791ac313b548' into daimini/gitflow_211027_o3de

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-10-27 11:21:36 -07:00
parent ae698c2818 057c8e0d4e
commit 6b06885f23
1 changed files with 1 additions and 1 deletions
@@ -102,7 +102,7 @@ namespace PhysX
            const float scaleFactor = (maxHeightBounds <= minHeightBounds) ? 1.0f : AZStd::numeric_limits<int16_t>::max() / halfBounds;
            const float heightScale{ 1.0f / scaleFactor };

-            const uint8_t physxMaximumMaterialIndex = 0x7f;
+            [[maybe_unused]] const uint8_t physxMaximumMaterialIndex = 0x7f;

            // Delete the cached heightfield object if it is there, and create a new one and save in the shape configuration
            heightfieldConfig.SetCachedNativeHeightfield(nullptr);