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/editors/physics | |
parent | 292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff) | |
parent | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 1fae5b70aff..e87de1a6875 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -714,8 +714,8 @@ static bool remap_hair_emitter( for (i = 0, tpa = target_psys->particles, pa = psys->particles; i < target_psys->totpart; - i++, tpa++, pa++) { - + i++, tpa++, pa++) + { float from_co[3]; BVHTreeNearest nearest; @@ -1026,8 +1026,8 @@ static bool copy_particle_systems_to_object(const bContext *C, cdmask = 0; for (psys_from = PSYS_FROM_FIRST, i = 0; psys_from; - psys_from = PSYS_FROM_NEXT(psys_from), ++i) { - + psys_from = PSYS_FROM_NEXT(psys_from), ++i) + { psys = BKE_object_copy_particlesystem(psys_from, 0); tmp_psys[i] = psys; @@ -1047,8 +1047,8 @@ static bool copy_particle_systems_to_object(const bContext *C, /* now append psys to the object and make modifiers */ for (i = 0, psys_from = PSYS_FROM_FIRST; i < totpsys; - ++i, psys_from = PSYS_FROM_NEXT(psys_from)) { - + ++i, psys_from = PSYS_FROM_NEXT(psys_from)) + { ParticleSystemModifierData *psmd; psys = tmp_psys[i]; @@ -1086,8 +1086,8 @@ static bool copy_particle_systems_to_object(const bContext *C, */ for (psys = psys_start, psys_from = PSYS_FROM_FIRST, i = 0; psys; - psys = psys->next, psys_from = PSYS_FROM_NEXT(psys_from), ++i) { - + psys = psys->next, psys_from = PSYS_FROM_NEXT(psys_from), ++i) + { float (*from_mat)[4], (*to_mat)[4]; switch (space) { |