mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 07:45:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'vector-magic-effects-2' into 'master'

Browse source 
Fix effects not being removed from scene graph

See merge request OpenMW/openmw!1997
This commit is contained in:
psi29a 2022-06-10 21:05:32 +00:00
commit 38ca20fa77
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwrender/effectmanager.cpp
View file

@ -66,10 +66,13 @@ void EffectManager::update(float dt)
std::remove_if( std::remove_if(
mEffects.begin(), mEffects.begin(),
mEffects.end(), mEffects.end(),
[dt](Effect& effect) [dt, this](Effect& effect)
{ {
effect.mAnimTime->addTime(dt); effect.mAnimTime->addTime(dt);
return effect.mAnimTime->getTime() >= effect.mMaxControllerLength; const auto remove = effect.mAnimTime->getTime() >= effect.mMaxControllerLength;
if (remove)
mParentNode->removeChild(effect.mTransform);
return remove;
}), }),
mEffects.end() mEffects.end()
); );