diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
commit | 49ee1a97d2704d8cc707201675a919b9ef103fec (patch) | |
tree | 17c78db252f4b24297490de623fe5f303cea181a /source/blender/blenkernel | |
parent | 292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff) | |
parent | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff) |
Merge branch 'master' into blender2.8
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 339dcc4a62e..e928dfaab37 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -458,7 +458,8 @@ void clothModifier_do(ClothModifierData *clmd, const struct EvaluationContext *e 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 c261b0dc22c..452972c0ab2 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 ebdc1b327d8..82efe66d8da 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3699,7 +3699,8 @@ void sbObjectStep(const struct EvaluationContext *eval_ctx, Scene *scene, Object 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); |