From 1acac873cfcf04d5726a3c910b944798f5cc0c03 Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Fri, 6 Oct 2023 01:40:23 +0200 Subject: [PATCH] Use "setObjectRoot" in esm4npcanimation.cpp --- apps/openmw/mwrender/esm4npcanimation.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwrender/esm4npcanimation.cpp b/apps/openmw/mwrender/esm4npcanimation.cpp index 005751c420..0a4d3c9b64 100644 --- a/apps/openmw/mwrender/esm4npcanimation.cpp +++ b/apps/openmw/mwrender/esm4npcanimation.cpp @@ -22,13 +22,16 @@ namespace MWRender const MWWorld::Ptr& ptr, osg::ref_ptr parentNode, Resource::ResourceSystem* resourceSystem) : Animation(ptr, std::move(parentNode), resourceSystem) { - getOrCreateObjectRoot(); + std::string smodel + = Misc::ResourceHelpers::correctMeshPath(mPtr.getClass().getModel(mPtr), mResourceSystem->getVFS()); + setObjectRoot(smodel, true, true, false); updateParts(); } void ESM4NpcAnimation::updateParts() { - mObjectRoot->removeChildren(0, mObjectRoot->getNumChildren()); + if (!mObjectRoot.get()) + return; const ESM4::Npc* traits = MWClass::ESM4Npc::getTraitsRecord(mPtr); // There is no flag "mIsTES5", so we can not distinguish from other cases. // But calling wrong `updateParts*` function shouldn't crash the game and will