Fix assert: Avoid doing operations over invalid Aabb (#3757)

Signed-off-by: moraaar <moraaar@amazon.com>
2021-09-01 09:43:47 +01:00
parent 2d45a6b4cb
commit 564925c285
1 changed files with 7 additions and 8 deletions
@@ -578,15 +578,14 @@ namespace AZ
        {
            if (m_meshHandle.IsValid() && m_meshFeatureProcessor)
            {
-                Aabb aabb = m_meshFeatureProcessor->GetLocalAabb(m_meshHandle);
+                if (Aabb aabb = m_meshFeatureProcessor->GetLocalAabb(m_meshHandle); aabb.IsValid())
+                {
+                    aabb.MultiplyByScale(m_cachedNonUniformScale);
+                    return aabb;
+                }
+            }

-                aabb.MultiplyByScale(m_cachedNonUniformScale);
-                return aabb;
-            }
-            else
-            {
-                return Aabb::CreateNull();
-            }
+            return Aabb::CreateNull();
        }

        AzFramework::RenderGeometry::RayResult MeshComponentController::RenderGeometryIntersect(