Changeset 9954 for ps

Timestamp:

08/02/11 23:07:58 (13 years ago)

Author:

philip

Message:

Fix hang with Boost 1.47

File:

• ps/trunk/source/graphics/ParticleEmitterType.cpp (modified) (1 diff)

ps/trunk/source/graphics/ParticleEmitterType.cpp

@@ -446 +446 @@
             if (id != -1)
             {
-                m_Variables[id] = IParticleVarPtr(new CParticleVarUniform(
-                    Child.GetAttributes().GetNamedItem(at_min).ToFloat(),
-                    Child.GetAttributes().GetNamedItem(at_max).ToFloat()
-                ));
+                float min = Child.GetAttributes().GetNamedItem(at_min).ToFloat();
+                float max = Child.GetAttributes().GetNamedItem(at_max).ToFloat();
+                // To avoid hangs in the RNG, only use it if [min, max) is non-empty
+                if (min < max)
+                    m_Variables[id] = IParticleVarPtr(new CParticleVarUniform(min, max));
+                else
+                    m_Variables[id] = IParticleVarPtr(new CParticleVarConstant(min));
             }
         }