Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities

2021-05-21 10:54:44 -05:00
parent bb53e8f607 d8bd6ef407
commit 20ee399864
78 changed files with 3016 additions and 507 deletions
@@ -109,13 +109,9 @@ namespace SandboxEditor

    bool ModernViewportCameraControllerInstance::HandleInputChannelEvent(const AzFramework::ViewportControllerInputEvent& event)
    {
-        AzFramework::WindowSize windowSize;
-        AzFramework::WindowRequestBus::EventResult(
-            windowSize, event.m_windowHandle, &AzFramework::WindowRequestBus::Events::GetClientAreaSize);
-
        if (ShouldHandle(event.m_priority, m_cameraSystem.m_cameras.Exclusive()))
        {
-            return m_cameraSystem.HandleEvents(AzFramework::BuildInputEvent(event.m_inputChannel, windowSize));
+            return m_cameraSystem.HandleEvents(AzFramework::BuildInputEvent(event.m_inputChannel));
        }

        return false;