[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50299] trunk/blender/intern/cycles/ blender/blender_particles.cpp: Cycles: Fix for particle info node crash: The particle 'alive' state can be set to 'dying', which is just an indicator that the particle will be removed, but it is is used for instancing.

[Lukas Toenne]

Revision: 50299
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50299
Author:   lukastoenne
Date:     2012-08-31 19:39:08 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
Cycles: Fix for particle info node crash: The particle 'alive' state can be set to 'dying', which is just an indicator that the particle will be removed, but it is is used for instancing. This would lead to insufficient texture size and assert crash.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_particles.cpp

Modified: trunk/blender/intern/cycles/blender/blender_particles.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_particles.cpp	2012-08-31 19:39:06 UTC (rev 50298)
+++ trunk/blender/intern/cycles/blender/blender_particles.cpp	2012-08-31 19:39:08 UTC (rev 50299)
@@ -111,7 +111,8 @@
 
 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)