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

9 years ago · bd1f3493d7
parent ab2df963e9
commit bd1f3493d7
1 changed files with 8 additions and 2 deletions
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@ -1432,6 +1432,14 @@ void SkyManager::setWeather(const WeatherResult& weather)
    {
        mCurrentParticleEffect = weather.mParticleEffect;

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