From 497ea5f306a802a3f7aaddd1300d29613eba64af Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 18 Oct 2012 15:00:32 +0000 Subject: Fix #32912: cycles crash with dead particles, actual crash was caused by an inconsistency in the particle system code, using <= and <. Also tightened up checks on cycles side to avoid other potential crashes. --- source/blender/blenkernel/intern/particle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index cf5ea7e074f..1749ad18c9b 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -4320,7 +4320,7 @@ int psys_get_particle_state(ParticleSimulationData *sim, int p, ParticleKey *sta if (pa) { if (!always) { if ((cfra < pa->time && (part->flag & PART_UNBORN) == 0) || - (cfra > pa->dietime && (part->flag & PART_DIED) == 0)) + (cfra >= pa->dietime && (part->flag & PART_DIED) == 0)) { return 0; } -- cgit v1.2.3