diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
| commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
| tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/blenkernel/intern/pointcache.c | |
| parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
| parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/pointcache.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 50314daa014..3ab17b083db 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -441,9 +441,9 @@ static void ptcache_particle_extra_write(void *psys_v, PTCacheMem *pm, int UNUSE PTCacheExtra *extra = NULL; if (psys->part->phystype == PART_PHYS_FLUID && - psys->part->fluid && psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS && - psys->tot_fluidsprings && psys->fluid_springs) { - + psys->part->fluid && psys->part->fluid->flag & SPH_VISCOELASTIC_SPRINGS && + psys->tot_fluidsprings && psys->fluid_springs) + { extra = MEM_callocN(sizeof(PTCacheExtra), "Point cache: fluid extra data"); extra->type = BPHYS_EXTRA_FLUID_SPRINGS; @@ -790,8 +790,9 @@ static int ptcache_smoke_read(PTCacheFile *pf, void *smoke_v) /* check if resolution has changed */ if (sds->res[0] != ch_res[0] || - sds->res[1] != ch_res[1] || - sds->res[2] != ch_res[2]) { + sds->res[1] != ch_res[1] || + sds->res[2] != ch_res[2]) + { if (sds->flags & MOD_SMOKE_ADAPTIVE_DOMAIN) reallocate = 1; else @@ -2214,8 +2215,8 @@ static void ptcache_data_copy(void *from[], void *to[]) { int i; for (i=0; i<BPHYS_TOT_DATA; i++) { - /* note, durian file 03.4b_comp crashes if to[i] is not tested - * its NULL, not sure if this should be fixed elsewhere but for now its needed */ + /* note, durian file 03.4b_comp crashes if to[i] is not tested + * its NULL, not sure if this should be fixed elsewhere but for now its needed */ if (from[i] && to[i]) memcpy(to[i], from[i], ptcache_data_size[i]); } |