diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:13:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:13:48 +0300 |
| commit | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (patch) | |
| tree | ce52b7a9a8941912152cc3bf7d07fb2a429b5d0d /source/blender/blenkernel | |
| parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) | |
Cleanup: indentation
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 10 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index e1717f60a0f..9ae295e2e3b 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -456,7 +456,8 @@ void clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, Derived cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, can_simulate); if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED || - (!can_simulate && cache_result == PTCACHE_READ_OLD)) { + (!can_simulate && cache_result == PTCACHE_READ_OLD)) + { BKE_cloth_solver_set_positions(clmd); cloth_to_object (ob, clmd, vertexCos); diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index bcb2b770db3..d1c6dbe421c 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -240,10 +240,12 @@ static void distribute_grid(DerivedMesh *dm, ParticleSystem *psys) if (mface->v4 && (!intersects_tri || from==PART_FROM_VOLUME)) { copy_v3_v3(v4, mvert[mface->v4].co); - if (isect_ray_tri_watertight_v3(co1, - &isect_precalc, - v1, v3, v4, - &lambda, NULL)) { + if (isect_ray_tri_watertight_v3( + co1, + &isect_precalc, + v1, v3, v4, + &lambda, NULL)) + { if (from==PART_FROM_FACE) (pa+(int)(lambda*size[a])*a0mul)->flag &= ~PARS_UNEXIST; else diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 1b6fed70de3..c3527af90ca 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3722,7 +3722,8 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, can_simulate); if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED || - (!can_simulate && cache_result == PTCACHE_READ_OLD)) { + (!can_simulate && cache_result == PTCACHE_READ_OLD)) + { softbody_to_object(ob, vertexCos, numVerts, sb->local); BKE_ptcache_validate(cache, framenr); |