mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-23 12:09:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'getBoneByName_searchRoot' into 'master'

Browse source 
make ActorAnimation::getBoneByName take a searchRoot param

See merge request OpenMW/openmw!4491
This commit is contained in:
psi29a 2024-12-31 18:50:02 +00:00
commit 24361426c8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwrender/actoranimation.cpp
View file

@ -365,10 +365,17 @@ namespace MWRender
} }
mScabbard = attachMesh(scabbardName, boneName); mScabbard = attachMesh(scabbardName, boneName);
if (mScabbard && weaponClass == ESM::WeaponType::Ranged)
if (!mScabbard || !mScabbard->getNode())
return;
if (weaponClass == ESM::WeaponType::Ranged)
resetControllers(mScabbard->getNode()); resetControllers(mScabbard->getNode());
osg::Group* weaponNode = getBoneByName("Bip01 Weapon"); SceneUtil::FindByNameVisitor findVisitor("Bip01 Weapon");
mScabbard->getNode()->accept(findVisitor);
osg::Group* weaponNode = findVisitor.mFoundNode;
if (!weaponNode) if (!weaponNode)
return; return;