From 75dcbea36545fd564fd98561988cb423342d44a4 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Fri, 22 Jun 2018 13:09:02 +0400 Subject: [PATCH] Apply weapon reload animations only for upper body --- apps/openmw/mwmechanics/character.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index e6a8e8152..ef158a258 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -1627,16 +1627,18 @@ bool CharacterController::updateWeaponState() break; } + // Note: apply reload animations only for upper body since blending with movement animations can give weird result. + // Especially noticable with crossbow reload animation. if(!start.empty()) { mAnimation->disable(mCurrentWeapon); if (mUpperBodyState == UpperCharState_FollowStartToFollowStop) mAnimation->play(mCurrentWeapon, priorityWeapon, - MWRender::Animation::BlendMask_All, true, + MWRender::Animation::BlendMask_UpperBody, true, weapSpeed, start, stop, 0.0f, 0); else mAnimation->play(mCurrentWeapon, priorityWeapon, - MWRender::Animation::BlendMask_All, false, + MWRender::Animation::BlendMask_UpperBody, false, weapSpeed, start, stop, 0.0f, 0); } }