[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34973] trunk/blender/source/blender/ blenkernel/intern/pointcache.c: Bug fix: with bigger than 1 cache step dead particles didn't alway stay dead

[Janne Karhu]

Revision: 34973
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34973
Author:   jhk
Date:     2011-02-18 15:21:52 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Bug fix: with bigger than 1 cache step dead particles didn't alway stay dead
* Particle die time wasn't properly taken into account when reading from the cache.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/pointcache.c

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-02-18 15:06:02 UTC (rev 34972)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-02-18 15:21:52 UTC (rev 34973)
@@ -280,6 +280,8 @@
 	/* set frames cached before birth to birth time */
 	if(cfra < pa->time)
 		pa->state.time = pa->time;
+	else if(cfra > pa->dietime)
+		pa->state.time = pa->dietime;
 
 	if(data[BPHYS_DATA_SIZE])
 		PTCACHE_DATA_TO(data, BPHYS_DATA_SIZE, 0, &pa->size);