mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-10 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fixcolladaanimopbug' into 'master'

Browse Source 
Fix Collada animated object bug #7051

Closes #7051

See merge request OpenMW/openmw!2565
This commit is contained in:
psi29a 2023-01-06 10:10:27 +00:00
commit 0d8d15a732
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwrender/objectpaging.cpp
View File

@ -8,6 +8,7 @@
#include <osg/MatrixTransform> #include <osg/MatrixTransform>
#include <osg/Sequence> #include <osg/Sequence>
#include <osg/Switch> #include <osg/Switch>
#include <osgAnimation/BasicAnimationManager>
#include <osgUtil/IncrementalCompileOperation> #include <osgUtil/IncrementalCompileOperation>
#include <components/esm3/esmreader.hpp> #include <components/esm3/esmreader.hpp>
@ -643,7 +644,9 @@ namespace MWRender
{ {
if (cnode->getNumChildrenRequiringUpdateTraversal() > 0 if (cnode->getNumChildrenRequiringUpdateTraversal() > 0
|| SceneUtil::hasUserDescription(cnode, Constants::NightDayLabel) || SceneUtil::hasUserDescription(cnode, Constants::NightDayLabel)
|| SceneUtil::hasUserDescription(cnode, Constants::HerbalismLabel)) || SceneUtil::hasUserDescription(cnode, Constants::HerbalismLabel)
|| (cnode->getName() == "Collada visual scene group"
&& dynamic_cast<const osgAnimation::BasicAnimationManager*>(cnode->getUpdateCallback())))
continue; continue;
else else
refnumSet->mRefnums.push_back(pair.first); refnumSet->mRefnums.push_back(pair.first);

3
components/resource/scenemanager.cpp
View File

@ -636,6 +636,9 @@ namespace Resource
backToOriginTrans->addChild(newRiggeometryHolder); backToOriginTrans->addChild(newRiggeometryHolder);
group->addChild(backToOriginTrans); group->addChild(backToOriginTrans);
node->getOrCreateUserDataContainer()->addUserObject(
new TemplateRef(newRiggeometryHolder->getGeometry(0)));
} }
} }
} }