From d66b81d7f71a6fe4fdcfe91341c199e0aa29bb6e Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 5 Dec 2019 17:35:32 +0400
Subject: [PATCH] Reset holstered shield before rebuilding an NPC animation

---
 apps/openmw/mwrender/npcanimation.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index abc2583d58..063c1a60fb 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -409,6 +409,7 @@ void NpcAnimation::setRenderBin()
 void NpcAnimation::rebuild()
 {
     mScabbard.reset();
+    mHolsteredShield.reset();
     updateNpcBase();
 
     MWBase::Environment::get().getMechanicsManager()->forceStateUpdate(mPtr);