Merge pull request #676 from aws-lumberyard-dev/pruiksma/ATOM-15515

ATOM-15515 Fixing nullptr reference in OnShapeChanged() in light delegates.
2021-05-11 11:02:52 -05:00
parent 3defbce31b 7957d3f8b6
commit 02d88bc8da
1 changed files with 6 additions and 1 deletions
@@ -101,6 +101,7 @@ namespace AZ
        template <typename FeatureProcessorType>
        void LightDelegateBase<FeatureProcessorType>::OnShapeChanged(ShapeChangeReasons changeReason)
        {
+            AZ_Assert(m_shapeBus, "OnShapeChanged called without a shape bus present.");
            if (changeReason == ShapeChangeReasons::TransformChanged)
            {
                AZ::Aabb aabb; // unused, but required for GetTransformAndLocalBounds()
@@ -133,7 +134,11 @@ namespace AZ
            {
                // now visible, acquire light handle and update values.
                m_lightHandle = m_featureProcessor->AcquireLight();
-                OnShapeChanged(ShapeChangeReasons::TransformChanged);
+                if (m_shapeBus)
+                {
+                    // For lights that get their transform from the shape bus, force an OnShapeChanged to update the transform.
+                    OnShapeChanged(ShapeChangeReasons::TransformChanged);
+                }
            }
        }