Browse Source

Prevent additive scale modification making particle scale negative. Closes #624.

Lasse Öörni 11 years ago
parent
commit
bcf451bfe2
1 changed files with 2 additions and 0 deletions
  1. 2 0
      Source/Urho3D/Graphics/ParticleEmitter.cpp

+ 2 - 0
Source/Urho3D/Graphics/ParticleEmitter.cpp

@@ -206,6 +206,8 @@ void ParticleEmitter::Update(const FrameInfo& frame)
             if (sizeAdd != 0.0f || sizeMul != 1.0f)
             {
                 particle.scale_ += lastTimeStep_ * sizeAdd;
+                if (particle.scale_ < 0.0f)
+                    particle.scale_ = 0.0f;
                 if (sizeMul != 1.0f)
                     particle.scale_ *= (lastTimeStep_ * (sizeMul - 1.0f)) + 1.0f;
                 billboard.size_ = particle.size_ * particle.scale_;