Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 12:58:00 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch 'getBoneByName_searchRoot' into 'master'
Some checks are pending
Build and test / Ubuntu (push) Waiting to run
Details
Build and test / MacOS (push) Waiting to run
Details
Build and test / Read .env file and expose it as output (push) Waiting to run
Details
Build and test / Windows (2019) (push) Blocked by required conditions
Details
Build and test / Windows (2022) (push) Blocked by required conditions
Details

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
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);
if (mScabbard && weaponClass == ESM::WeaponType::Ranged)
if (!mScabbard || !mScabbard->getNode())
return;
if (weaponClass == ESM::WeaponType::Ranged)
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)
return;