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/intern/particle_distribute.c | |
| parent | 292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff) | |
| parent | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/particle_distribute.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 10 |
1 files changed, 6 insertions, 4 deletions
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 |