Merge branch 'main' into ly-as-sdk/LYN-2948

2021-05-11 10:52:47 -05:00
parent b3ae71a5d8 a009e38064
commit 0114a82294
373 changed files with 1416 additions and 40311 deletions
@@ -453,8 +453,11 @@ void EditorViewportWidget::Update()
    }

    m_updatingCameraPosition = true;
-    auto transform = LYTransformToAZTransform(m_Camera.GetMatrix());
-    m_renderViewport->GetViewportContext()->SetCameraTransform(transform);
+    if (!ed_useNewCameraSystem)
+    {
+        m_renderViewport->GetViewportContext()->SetCameraTransform(LYTransformToAZTransform(m_Camera.GetMatrix()));
+    }
+
    AZ::Matrix4x4 clipMatrix;
    AZ::MakePerspectiveFovMatrixRH(
        clipMatrix,