Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
This commit is contained in:
Esteban Papp
2021-08-25 14:50:05 -07:00
113 changed files with 380 additions and 14845 deletions
@@ -23,6 +23,9 @@
#include "UiElementComponent.h"
#include "UiCanvasComponent.h"
#include <set>
#include <list>
namespace
{
bool AxisAlignedBoxesIntersect(const AZ::Vector2& minA, const AZ::Vector2& maxA, const AZ::Vector2& minB, const AZ::Vector2& maxB)
@@ -273,7 +276,7 @@ AZ::Vector2 UiTransform2dComponent::GetViewportSpacePivot()
AZ::Matrix4x4 transform;
parentTransformComponent->GetTransformToViewport(transform);
point3 = transform * point3;
point3 = transform * point3;
}
return AZ::Vector2(point3.GetX(), point3.GetY());