From 29860b838eb46086b8eadbaf97c6b37377688b36 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 28 May 2021 11:30:28 +0200
Subject: [PATCH] Fix camera position when changing Editor view EditorViewport

#531
---
 Source/Editor/Viewport/EditorViewport.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 2dee43614..6e2288979 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -661,12 +661,12 @@ namespace FlaxEditor.Viewport
         {
             if (ViewportCamera is FPSCamera fpsCamera)
             {
-                var pos = Vector3.Zero + Vector3.Backward * orientation * 2000.0f;
+                var pos = ViewPosition + Vector3.Backward * orientation * 2000.0f;
                 fpsCamera.MoveViewport(pos, orientation);
             }
             else
             {
-                ViewportCamera.SetArcBallView(orientation, Vector3.Zero, 2000.0f);
+                ViewportCamera.SetArcBallView(orientation, ViewPosition, 2000.0f);
             }
         }