Merge pull request #2626 from akortunov/master

Reset holstered shield before rebuilding an NPC animation

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);