merge stabilization/2110 to development - 2021/11/09

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-09 09:19:54 +00:00
parent 36043983cc dcc2890da3
commit 5047ba7f7b
89 changed files with 1205 additions and 1125 deletions
@@ -799,7 +799,8 @@ namespace AZ::AtomBridge
            const float startAngle = DegToRad(startAngleDegrees);
            const float stopAngle = DegToRad(sweepAngleDegrees) + startAngle;
            SingleColorDynamicSizeLineHelper lines(1+static_cast<int>(sweepAngleDegrees/angularStepDegrees));
-            AZ::Vector3 radiusV3 = AZ::Vector3(radius);
+            float aspectRadius = radius / GetAspectRatio();
+            AZ::Vector3 radiusV3 = AZ::Vector3(aspectRadius, radius, radius);
            AZ::Vector3 pos = AZ::Vector3(center.GetX(), center.GetY(), z);
            CreateAxisAlignedArc(
                lines, 
@@ -111,6 +111,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
        RUNTIME_DEPENDENCIES
            Gem::Atom_RPI.Editor
            Gem::Atom_Feature_Common.Editor
+            Gem::AtomToolsFramework.Editor
            Legacy::EditorCommon
    )

@@ -46,7 +46,7 @@ echo     DCCSI_PY_VERSION_RELEASE = %DCCSI_PY_VERSION_RELEASE%
 echo     DCCSI_MAYA_VERSION = %DCCSI_MAYA_VERSION%

 :::: Set Maya native project acess to this project
-IF "%MAYA_PROJECT%"=="" (set MAYA_PROJECT=%O3DE_PROJECT%)
+IF "%MAYA_PROJECT%"=="" (set MAYA_PROJECT=%O3DE_PROJECT_PATH%)
 echo     MAYA_PROJECT = %MAYA_PROJECT%

 :: maya sdk path