From 3941c42a7162c2a3773aeb6cc1ddd69ea12397e6 Mon Sep 17 00:00:00 2001
From: Petr Mikheev <ptmikheev@gmail.com>
Date: Sun, 17 Oct 2021 21:35:34 +0200
Subject: [PATCH] Use `applyDeferredPreviewRotationToPlayer` only after
 applying values from `luaControls`. Otherwise camera rotation is not smooth
 when movement is controlled from lua.

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 2 --
 apps/openmw/mwmechanics/actors.cpp      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index cf1b0e936d..5d737bd446 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -101,8 +101,6 @@ namespace MWInput
         mMouseManager->update(dt);
         mSensorManager->update(dt);
         mActionManager->update(dt, controllerMove);
-
-        MWBase::Environment::get().getWorld()->applyDeferredPreviewRotationToPlayer(dt);
     }
 
     void InputManager::setDragDrop(bool dragDrop)
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 32562591a5..b3ddefec3f 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1598,6 +1598,7 @@ namespace MWMechanics
 
             if (playerCharacter)
             {
+                MWBase::Environment::get().getWorld()->applyDeferredPreviewRotationToPlayer(duration);
                 playerCharacter->update(duration);
                 playerCharacter->setVisibility(1.f);
             }