mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 15:36:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2154 from akortunov/animfix

Browse source 
Do not check if additional animation sources are supported for every animation object
This commit is contained in:
Bret Curtis 2019-02-04 14:49:08 +01:00 committed by GitHub
commit 038a4c46c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);
mLightListCallback = new SceneUtil::LightListCallback;
mUseAdditionalSources = Settings::Manager::getBool ("use additional anim sources", "Game");
}
Animation::~Animation()
@ -754,7 +752,8 @@ namespace MWRender
addSingleAnimSource(kfname, baseModel);
if (mUseAdditionalSources)
static const bool useAdditionalSources = Settings::Manager::getBool ("use additional anim sources", "Game");
if (useAdditionalSources)
loadAllAnimationsInFolder(kfname, baseModel);
}

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

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