Cycles: Fix for particle info node crash: The particle 'alive' state can be set to...
authorLukas Toenne <lukas.toenne@googlemail.com>
Fri, 31 Aug 2012 19:39:08 +0000 (19:39 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Fri, 31 Aug 2012 19:39:08 +0000 (19:39 +0000)
intern/cycles/blender/blender_particles.cpp

index e5de389592bae1b2be5dc71a9679287bf207e559..177912cd8f09a432bb952046421698c037f23a32 100644 (file)
@@ -111,7 +111,8 @@ static bool use_particle_system(BL::ParticleSystem b_psys)
 
 static bool use_particle(BL::Particle b_pa)
 {
-       return b_pa.is_exist() && b_pa.is_visible() && b_pa.alive_state()==BL::Particle::alive_state_ALIVE;
+       return b_pa.is_exist() && b_pa.is_visible() &&
+               (b_pa.alive_state()==BL::Particle::alive_state_ALIVE || b_pa.alive_state()==BL::Particle::alive_state_DYING);
 }
 
 static int psys_count_particles(BL::ParticleSystem b_psys)