teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix weather particles not being cleared when changing from one particle effect to another

Browse source
This commit is contained in:
scrawl 2015-11-02 21:35:03 +01:00
parent ab2df963e9
commit bd1f3493d7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/sky.cpp
View file

@ -1432,6 +1432,14 @@ void SkyManager::setWeather(const WeatherResult& weather)
{ {
mCurrentParticleEffect = weather.mParticleEffect; mCurrentParticleEffect = weather.mParticleEffect;
// cleanup old particles
if (mParticleEffect)
{
mParticleNode->removeChild(mParticleEffect);
mParticleEffect = NULL;
mParticleFader = NULL;
}
if (mCurrentParticleEffect.empty()) if (mCurrentParticleEffect.empty())
{ {
if (mParticleNode) if (mParticleNode)
@ -1439,8 +1447,6 @@ void SkyManager::setWeather(const WeatherResult& weather)
mRootNode->removeChild(mParticleNode); mRootNode->removeChild(mParticleNode);
mParticleNode = NULL; mParticleNode = NULL;
} }
mParticleEffect = NULL;
mParticleFader = NULL;
} }
else else
{ {