diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-25 03:42:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-25 03:42:28 +0300 |
commit | abd18f6ec0631b0a03bc7730e3241c5e2b61a788 (patch) | |
tree | b40e725936e9154713c568603cfcaff9dfb6204c /source/blender/blenkernel | |
parent | e86e0aad55675a5c4473d0538146dbccda7613e8 (diff) |
Cleanup: style
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index b6fc9d5178e..8ce5099305c 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -21,10 +21,10 @@ * \ingroup bke */ -typedef void* CCGMeshHDL; -typedef void* CCGVertHDL; -typedef void* CCGEdgeHDL; -typedef void* CCGFaceHDL; +typedef void *CCGMeshHDL; +typedef void *CCGVertHDL; +typedef void *CCGEdgeHDL; +typedef void *CCGFaceHDL; typedef struct CCGEdge CCGEdge; typedef struct CCGFace CCGFace; @@ -40,7 +40,7 @@ typedef struct CCGMeshIFC { /***/ -typedef void* CCGAllocatorHDL; +typedef void *CCGAllocatorHDL; typedef struct CCGAllocatorIFC { void* (*alloc) (CCGAllocatorHDL a, int numBytes); diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 28a2e6e94cb..7ec50ead0bb 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1557,7 +1557,7 @@ typedef struct SPHRangeData { SPHNeighbor neighbors[SPH_NEIGHBORS]; int tot_neighbors; - float* data; + float *data; ParticleSystem *npsys; ParticleData *pa; @@ -1623,8 +1623,8 @@ static void sph_density_accum_cb(void *userdata, int index, const float co[3], f if (pfr->use_size) q *= npa->size; - pfr->data[0] += q*q; - pfr->data[1] += q*q*q; + pfr->data[0] += q * q; + pfr->data[1] += q * q * q; } /* diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 60e40c0c61b..0d8b2381572 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1565,7 +1565,7 @@ static void sb_sfesf_threads_run(struct Depsgraph *depsgraph, Scene *scene, stru /* --- the spring external section*/ -static int choose_winner(float*w, float* pos, float*a, float*b, float*c, float*ca, float*cb, float*cc) +static int choose_winner(float *w, float *pos, float *a, float *b, float *c, float *ca, float *cb, float *cc) { float mindist, cp; int winner =1; @@ -1885,13 +1885,13 @@ static void sb_spring_force(Object *ob, int bpi, BodySpring *bs, float iks, floa switch (bs->springtype) { case SB_EDGE: case SB_HANDLE: - forcefactor *= kw; + forcefactor *= kw; break; case SB_BEND: - forcefactor *=sb->secondspring*kw; + forcefactor *= sb->secondspring * kw; break; case SB_STIFFQUAD: - forcefactor *=sb->shearstiff*sb->shearstiff* kw; + forcefactor *= sb->shearstiff * sb->shearstiff * kw; break; default: break; @@ -2043,11 +2043,11 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo BKE_effectors_apply(effectors, NULL, sb->effector_weights, &epoint, force, speed); /* apply forcefield*/ - mul_v3_fl(force, fieldfactor* eval_sb_fric_force_scale); + mul_v3_fl(force, fieldfactor * eval_sb_fric_force_scale); add_v3_v3(bp->force, force); /* BP friction in moving media */ - kd= sb->mediafrict* eval_sb_fric_force_scale; + kd= sb->mediafrict * eval_sb_fric_force_scale; bp->force[0] -= kd * (bp->vec[0] + windfactor*speed[0]/eval_sb_fric_force_scale); bp->force[1] -= kd * (bp->vec[1] + windfactor*speed[1]/eval_sb_fric_force_scale); bp->force[2] -= kd * (bp->vec[2] + windfactor*speed[2]/eval_sb_fric_force_scale); @@ -2056,7 +2056,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo } else { /* BP friction in media (not) moving*/ - float kd = sb->mediafrict* sb_fric_force_scale(ob); + float kd = sb->mediafrict * sb_fric_force_scale(ob); /* assume it to be proportional to actual velocity */ bp->force[0]-= bp->vec[0]*kd; bp->force[1]-= bp->vec[1]*kd; |