Merge pull request OpenMW#2591 from akortunov/sheathing

Do not show shields in the 1st-person view when shield sheathing is enabled
rayleo189 · Nov 9, 2019 · d3cd640 · d3cd640
2 parents f335044 + 1835a39
commit d3cd640
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
@@ -113,7 +113,7 @@ bool ActorAnimation::updateCarriedLeftVisible(const int weaptype) const
         {
             SceneUtil::FindByNameVisitor findVisitor ("Bip01 AttachShield");
             mObjectRoot->accept(findVisitor);
-            if (findVisitor.mFoundNode)
+            if (findVisitor.mFoundNode || (mPtr == MWMechanics::getPlayer() && mPtr.isInCell() && MWBase::Environment::get().getWorld()->isFirstPerson()))
             {
                 const MWWorld::InventoryStore& inv = cls.getInventoryStore(mPtr);
                 const MWWorld::ConstContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);