mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

Skip merging for only animated models (Collada)

Browse source
This commit is contained in:
unelsson 2023-01-05 01:34:26 +02:00
parent d065dbbefa
commit bfa0e751dd
1 changed files with 3 additions and 2 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>
@ -16,7 +17,6 @@
#include <components/esm3/loaddoor.hpp> #include <components/esm3/loaddoor.hpp>
#include <components/esm3/loadstat.hpp> #include <components/esm3/loadstat.hpp>
#include <components/debug/debuglog.hpp>
#include <components/esm3/readerscache.hpp> #include <components/esm3/readerscache.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/resource/scenemanager.hpp> #include <components/resource/scenemanager.hpp>
@ -645,7 +645,8 @@ 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") || (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);