mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-29 00:06:41 +00:00
Skip merging for only animated models (Collada)
This commit is contained in:
parent
d065dbbefa
commit
bfa0e751dd
1 changed files with 3 additions and 2 deletions
|
@ -8,6 +8,7 @@
|
|||
#include <osg/MatrixTransform>
|
||||
#include <osg/Sequence>
|
||||
#include <osg/Switch>
|
||||
#include <osgAnimation/BasicAnimationManager>
|
||||
#include <osgUtil/IncrementalCompileOperation>
|
||||
|
||||
#include <components/esm3/esmreader.hpp>
|
||||
|
@ -16,7 +17,6 @@
|
|||
#include <components/esm3/loaddoor.hpp>
|
||||
#include <components/esm3/loadstat.hpp>
|
||||
|
||||
#include <components/debug/debuglog.hpp>
|
||||
#include <components/esm3/readerscache.hpp>
|
||||
#include <components/misc/resourcehelpers.hpp>
|
||||
#include <components/resource/scenemanager.hpp>
|
||||
|
@ -645,7 +645,8 @@ namespace MWRender
|
|||
if (cnode->getNumChildrenRequiringUpdateTraversal() > 0
|
||||
|| SceneUtil::hasUserDescription(cnode, Constants::NightDayLabel)
|
||||
|| 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;
|
||||
else
|
||||
refnumSet->mRefnums.push_back(pair.first);
|
||||
|
|
Loading…
Reference in a new issue