Merge pull request #2029 from akortunov/actorfix

[Regression] Handle case in the editor when actor's bodypart was not found
pull/2036/head
Bret Curtis 6 years ago committed by GitHub
commit 194232abde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -113,7 +113,9 @@ namespace CSMWorld
const std::string ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
{
auto it = mParts.find(index);
if (it == mParts.end() && mRaceData && mRaceData->handlesPart(index))
if (it == mParts.end())
{
if (mRaceData && mRaceData->handlesPart(index))
{
if (mFemale)
{
@ -126,6 +128,9 @@ namespace CSMWorld
return mRaceData->getMalePart(index);
}
return "";
}
const std::string& partName = it->second.first;
return partName;
}

Loading…
Cancel
Save