Merge pull request #2697 from Capostrophic/shield

Don't try to attach absent (empty path) shield models to NPCs
5 years ago · 7d53c6274d
parent 36f1b632ec fcbd3b4324
commit 7d53c6274d
1 changed files with 4 additions and 2 deletions
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@ -1011,9 +1011,11 @@ void NpcAnimation::showCarriedLeft(bool show)
            if (!bodyparts.empty())
                mesh = getShieldBodypartMesh(bodyparts, !mNpc->isMale());
        }
-        if (addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
-                                   mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor))
+        if (mesh.empty() || addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
+                                        mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor))
        {
+            if (mesh.empty())
+                reserveIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1);
            if (iter->getTypeName() == typeid(ESM::Light).name() && mObjectParts[ESM::PRT_Shield])
                addExtraLight(mObjectParts[ESM::PRT_Shield]->getNode()->asGroup(), iter->get<ESM::Light>()->mBase);
        }