Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bug fix: with bigger than 1 cache step dead particles didn't alway stay dead

Browse Source 
* Particle die time wasn't properly taken into account when reading from the cache.
This commit is contained in:
Janne Karhu
2011-02-18 15:21:52 +00:00
parent a0b88e1c49
commit 13f9715e1c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/pointcache.c
View File

@@ -280,6 +280,8 @@ static void ptcache_particle_read(int index, void *psys_v, void **data, float cf
/* set frames cached before birth to birth time */ /* set frames cached before birth to birth time */
if(cfra < pa->time) if(cfra < pa->time)
pa->state.time = pa->time; pa->state.time = pa->time;
else if(cfra > pa->dietime)
pa->state.time = pa->dietime;
if(data[BPHYS_DATA_SIZE]) if(data[BPHYS_DATA_SIZE])
PTCACHE_DATA_TO(data, BPHYS_DATA_SIZE, 0, &pa->size); PTCACHE_DATA_TO(data, BPHYS_DATA_SIZE, 0, &pa->size);