teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove parts before setting the new object root

Browse source
This commit is contained in:
scrawl 2016-03-06 11:34:15 +01:00
parent 0df975a4d7
commit 0fc65db6bb
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwrender/animation.cpp
View file

@ -1457,6 +1457,9 @@ namespace MWRender
PartHolder::~PartHolder()
{
if (mNode.get() && !mNode->getNumParents())
std::cerr << "Warning: part has no parents " << std::endl;
if (mNode.get() && mNode->getNumParents())
{
if (mNode->getNumParents() > 1)

4
apps/openmw/mwrender/npcanimation.cpp
View file

@ -422,6 +422,8 @@ int NpcAnimation::getSlot(const osg::NodePath &path) const
void NpcAnimation::updateNpcBase()
{
clearAnimSources();
for(size_t i = 0;i < ESM::PRT_Count;i++)
removeIndividualPart((ESM::PartReferenceType)i);
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
const ESM::Race *race = store.get<ESM::Race>().find(mNpc->mRace);
@ -501,8 +503,6 @@ void NpcAnimation::updateNpcBase()
}
}
for(size_t i = 0;i < ESM::PRT_Count;i++)
removeIndividualPart((ESM::PartReferenceType)i);
updateParts();
mWeaponAnimationTime->updateStartTime();