From e8cbdcfb1e98956b86df8d80eb268882d951864b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 31 Jul 2015 00:35:17 +0200
Subject: [PATCH] Play swimming animation fallback on the upper body when
 possible

---
 apps/openmw/mwmechanics/character.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 9d5f7137f..ae4412dbf 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -390,7 +390,8 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
                 }
                 else
                 {
-                    movemask = MWRender::Animation::BlendMask_LowerBody;
+                    if (weap != sWeaponTypeListEnd)
+                        movemask = MWRender::Animation::BlendMask_LowerBody;
                     movementAnimName.erase(swimpos, 4);
                     if(!mAnimation->hasAnimation(movementAnimName))
                         movementAnimName.clear();