From ecafcefae9efaab61d21f429f10be598ec178e21 Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Sun, 24 Jun 2018 14:39:48 +0300
Subject: [PATCH] Fall back to regular head when getVampireHead fails

---
 apps/openmw/mwrender/npcanimation.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 08e376f08..baf6cb822 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -416,6 +416,7 @@ void NpcAnimation::updateNpcBase()
     const ESM::Race *race = store.get<ESM::Race>().find(mNpc->mRace);
     bool isWerewolf = (mNpcType == Type_Werewolf);
     bool isVampire = (mNpcType == Type_Vampire);
+    bool isFemale = !mNpc->isMale();
 
     if (isWerewolf)
     {
@@ -425,8 +426,9 @@ void NpcAnimation::updateNpcBase()
     else
     {
         mHeadModel = "";
-        if (isVampire) // FIXME: fall back to regular head when getVampireHead fails?
-            mHeadModel = getVampireHead(mNpc->mRace, mNpc->mFlags & ESM::NPC::Female);
+        const std::string& vampireHead = getVampireHead(mNpc->mRace, isFemale);
+        if (isVampire && !vampireHead.empty())
+            mHeadModel = vampireHead;
         else if (!mNpc->mHead.empty())
         {
             const ESM::BodyPart* bp = store.get<ESM::BodyPart>().search(mNpc->mHead);
@@ -448,7 +450,6 @@ void NpcAnimation::updateNpcBase()
     }
 
     bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
-    bool isFemale = !mNpc->isMale();
 
     std::string smodel;
     if (mViewMode != VM_FirstPerson)