mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 11:09:41 +00:00
Code Issues Releases Wiki Activity

Do not check if additional animation sources are supported for every animation object

Browse source
This commit is contained in:
Andrei Kortunov 2019-02-03 11:27:48 +04:00
parent 9f716b9ed8
commit 57d8df1a05
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwrender/animation.cpp
View file

@ -641,8 +641,6 @@ namespace MWRender
mAnimationTimePtr[i].reset(new AnimationTime); mAnimationTimePtr[i].reset(new AnimationTime);
mLightListCallback = new SceneUtil::LightListCallback; mLightListCallback = new SceneUtil::LightListCallback;
mUseAdditionalSources = Settings::Manager::getBool ("use additional anim sources", "Game");
} }
Animation::~Animation() Animation::~Animation()
@ -754,7 +752,8 @@ namespace MWRender
addSingleAnimSource(kfname, baseModel); addSingleAnimSource(kfname, baseModel);
if (mUseAdditionalSources) static const bool useAdditionalSources = Settings::Manager::getBool ("use additional anim sources", "Game");
if (useAdditionalSources)
loadAllAnimationsInFolder(kfname, baseModel); loadAllAnimationsInFolder(kfname, baseModel);
} }

2
apps/openmw/mwrender/animation.hpp
View file

@ -273,8 +273,6 @@ protected:
osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback; osg::ref_ptr<SceneUtil::LightListCallback> mLightListCallback;
bool mUseAdditionalSources;
const NodeMap& getNodeMap() const; const NodeMap& getNodeMap() const;
/* Sets the appropriate animations on the bone groups based on priority. /* Sets the appropriate animations on the bone groups based on priority.