kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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.

Browse Source
This commit is contained in:
Lukas Toenne 2012-08-31 19:39:08 +00:00
parent 3ca3102bcf
commit 2694b68d4a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/blender/blender_particles.cpp
View 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)