diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-25 16:46:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-25 16:46:20 +0400 |
| commit | 40d9ab1139984205b5e2d711879252de2d011773 (patch) | |
| tree | f3941cf38f664aacb49caa8e129d0410b5af1fbe /source/blender/blenkernel/intern/pointcache.c | |
| parent | 62b541faa3566d9f658f3efb5a017e564bb785cf (diff) | |
add missing break to space-buttons listener, also rewind own recent change (uiPopupBlockHandle.retvec size)
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 06748dfc44d..33752e81c55 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -268,8 +268,9 @@ static int ptcache_particle_write(int index, void *psys_v, void **data, int cfr PTCACHE_DATA_FROM(data, BPHYS_DATA_SIZE, &pa->size); PTCACHE_DATA_FROM(data, BPHYS_DATA_TIMES, times); - if (boid) + if (boid) { PTCACHE_DATA_FROM(data, BPHYS_DATA_BOIDS, &boid->data); + } /* return flag 1+1=2 for newly born particles to copy exact birth location to previously cached frame */ return 1 + (pa->state.time >= pa->time && pa->prev_state.time <= pa->time); @@ -304,8 +305,9 @@ static void ptcache_particle_read(int index, void *psys_v, void **data, float cf 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); + } if (data[BPHYS_DATA_TIMES]) { float times[3]; |