merging from main

2021-04-15 08:18:11 +01:00
parent 217009de2b 70c2d5ee40
commit d8169e08fb
2503 changed files with 45147 additions and 527864 deletions
@@ -140,7 +140,9 @@ namespace AZ
            AZ::Vector3 nonUniformScale = AZ::Vector3::CreateOne();
            AZ::NonUniformScaleRequestBus::EventResult(nonUniformScale, GetEntityId(), &AZ::NonUniformScaleRequests::GetScale);

-            return m_controller.GetModel()->RayIntersection(transform, nonUniformScale, src, dir, distance);
+            AZ::Vector3 ignoreNormal;
+
+            return m_controller.GetModel()->RayIntersection(transform, nonUniformScale, src, dir, distance, ignoreNormal);
        }

        bool EditorMeshComponent::SupportsEditorRayIntersect()
@@ -200,7 +202,6 @@ namespace AZ
                &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay,
                AzToolsFramework::Refresh_EntireTree);
        }
-
        AZ::u32 EditorMeshComponent::OnConfigurationChanged()
        {
            // temp variable is needed to hold reference to m_modelAsset while it's being loaded.