Merge branch 'getBoneByName_searchRoot' into 'master'

make ActorAnimation::getBoneByName take a searchRoot param See merge request OpenMW/openmw!4491
OpenMW · Dec 31, 2024 · 2436142 · 2436142
2 parents d476c8c + e77db9f
commit 2436142
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
@@ -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;