From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/blenkernel/particle_private.h | 51 ++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 15 deletions(-) (limited to 'source/blender/blenkernel/particle_private.h') diff --git a/source/blender/blenkernel/particle_private.h b/source/blender/blenkernel/particle_private.h index 1d460b095f4..2a4ffa3d22a 100644 --- a/source/blender/blenkernel/particle_private.h +++ b/source/blender/blenkernel/particle_private.h @@ -25,23 +25,44 @@ #define __PARTICLE_PRIVATE_H__ typedef struct ParticleChildModifierContext { - ParticleThreadContext *thread_ctx; - ParticleSimulationData *sim; - ParticleTexture *ptex; - ChildParticle *cpa; - const float *par_co; /* float3 */ - const float *par_vel; /* float3 */ - const float *par_rot; /* float4 */ - const float *par_orco; /* float3 */ - const float *orco; /* float3 */ - ParticleCacheKey *parent_keys; + ParticleThreadContext *thread_ctx; + ParticleSimulationData *sim; + ParticleTexture *ptex; + ChildParticle *cpa; + const float *par_co; /* float3 */ + const float *par_vel; /* float3 */ + const float *par_rot; /* float4 */ + const float *par_orco; /* float3 */ + const float *orco; /* float3 */ + ParticleCacheKey *parent_keys; } ParticleChildModifierContext; -void do_kink(ParticleKey *state, const float par_co[3], const float par_vel[3], const float par_rot[4], float time, float freq, float shape, float amplitude, float flat, - short type, short axis, float obmat[4][4], int smooth_start); -float do_clump(ParticleKey *state, const float par_co[3], float time, const float orco_offset[3], float clumpfac, float clumppow, float pa_clump, - bool use_clump_noise, float clump_noise_size, CurveMapping *clumpcurve); +void do_kink(ParticleKey *state, + const float par_co[3], + const float par_vel[3], + const float par_rot[4], + float time, + float freq, + float shape, + float amplitude, + float flat, + short type, + short axis, + float obmat[4][4], + int smooth_start); +float do_clump(ParticleKey *state, + const float par_co[3], + float time, + const float orco_offset[3], + float clumpfac, + float clumppow, + float pa_clump, + bool use_clump_noise, + float clump_noise_size, + CurveMapping *clumpcurve); void do_child_modifiers(const ParticleChildModifierContext *modifier_ctx, - float mat[4][4], ParticleKey *state, float t); + float mat[4][4], + ParticleKey *state, + float t); #endif /* __PARTICLE_PRIVATE_H__ */ -- cgit v1.2.3