From c3fdccac1f5a455107f560e2e4e3e8cc2e6a8bb5 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Tue, 30 Apr 2019 17:51:38 +0400 Subject: [PATCH] Do not use the xbase_anim.kf as a fallback for werewolves (bug #5004) --- CHANGELOG.md | 1 + apps/openmw/mwrender/npcanimation.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96a5566be1..b6d95cd0dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ Bug #4984: "Friendly hits" feature should be used only for player's followers Bug #4989: Object dimension-dependent VFX scaling behavior is inconsistent Bug #4990: Dead bodies prevent you from hitting + Bug #5004: Werewolves shield their eyes during storm Feature #1774: Handle AvoidNode Feature #2229: Improve pathfinding AI Feature #3025: Analogue gamepad movement controls diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index 5c078e8245..e7f7d878b8 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -493,7 +493,7 @@ void NpcAnimation::updateNpcBase() if(!is1stPerson) { const std::string base = "meshes\\xbase_anim.nif"; - if (smodel != base) + if (smodel != base && !isWerewolf) addAnimSource(base, smodel); if (smodel != defaultSkeleton && base != defaultSkeleton) @@ -507,7 +507,7 @@ void NpcAnimation::updateNpcBase() else { const std::string base = "meshes\\xbase_anim.1st.nif"; - if (smodel != base) + if (smodel != base && !isWerewolf) addAnimSource(base, smodel); addAnimSource(smodel, smodel);