diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-08-31 23:39:08 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-08-31 23:39:08 +0400 |
| commit | 2694b68d4a9dac16b3b6c6c73b4422bd6fdd52a1 (patch) | |
| tree | 2bcf3b8f7befd7fa51b512b90a8eaca4ddcb5eb4 /intern/cycles/blender/blender_particles.cpp | |
| parent | 3ca3102bcfe93530a7955c5b7072c12e031abb64 (diff) | |
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.
Diffstat (limited to 'intern/cycles/blender/blender_particles.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_particles.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index e5de389592b..177912cd8f0 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -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) |