Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -137,7 +137,9 @@ namespace AZ
            AZ::Transform transform = AZ::Transform::CreateIdentity();
            AZ::TransformBus::EventResult(transform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);

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

        bool EditorMeshComponent::SupportsEditorRayIntersect()
@@ -197,7 +199,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.