diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 17:37:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-21 17:37:26 +0400 |
commit | 1615b46963f79e90621c155a5d85925a4b5171a3 (patch) | |
tree | f029c9dc35c645b9f622f82a8e761a18c033c208 /source/blender/blenkernel | |
parent | d02aed6c6474eafbcc312156d1debfccb230a00f (diff) |
style cleanup
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_pointcache.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 14 |
6 files changed, 15 insertions, 14 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 3e0180a84aa..67dba6fd7a7 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -85,7 +85,7 @@ typedef struct ParticleSimulationData { float courant_num; } ParticleSimulationData; -typedef struct ParticleTexture{ +typedef struct ParticleTexture { float ivel; /* used in reset */ float time, life, exist, size; /* used in init */ float damp, gravity, field; /* used in physics */ @@ -93,13 +93,13 @@ typedef struct ParticleTexture{ float rough1, rough2, roughe; /* used in path caching */ } ParticleTexture; -typedef struct ParticleSeam{ +typedef struct ParticleSeam { float v0[3], v1[3]; float nor[3], dir[3], tan[3]; float length2; } ParticleSeam; -typedef struct ParticleCacheKey{ +typedef struct ParticleCacheKey { float co[3]; float vel[3]; float rot[4]; diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index eba5c117199..d7d7324dd56 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -187,7 +187,7 @@ typedef struct PTCacheBaker { #define PEK_HIDE 4 #define PEK_USE_WCO 8 -typedef struct PTCacheEditKey{ +typedef struct PTCacheEditKey { float *co; float *vel; float *rot; diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 92eb696087d..294518458bf 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -274,7 +274,7 @@ void DM_init_funcs(DerivedMesh *dm) } void DM_init(DerivedMesh *dm, DerivedMeshType type, int numVerts, int numEdges, - int numTessFaces, int numLoops, int numPolys) + int numTessFaces, int numLoops, int numPolys) { dm->type = type; dm->numVertData = numVerts; diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 536d4d9c823..29eea3bb576 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2056,7 +2056,7 @@ void CustomData_set(const CustomData *data, int index, int type, void *source) /*Bmesh functions*/ /*needed to convert to/from different face reps*/ void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata, - int totloop, int totpoly) + int totloop, int totpoly) { int i; for (i=0; i < fdata->totlayer; i++) { diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index b08c1e1edf3..ee19b38e02b 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2375,6 +2375,7 @@ typedef struct SPHRangeData float massfac; int use_size; } SPHRangeData; + typedef struct SPHData { ParticleSystem *psys[10]; ParticleData *pa; @@ -2390,7 +2391,7 @@ typedef struct SPHData { /* Integrator callbacks. This allows different SPH implementations. */ void (*force_cb) (void *sphdata_v, ParticleKey *state, float *force, float *impulse); void (*density_cb) (void *rangedata_v, int index, float squared_dist); -}SPHData; +} SPHData; static void sph_density_accum_cb(void *userdata, int index, float squared_dist) { diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 6e4f4db129b..01930cc28da 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -113,7 +113,7 @@ typedef struct ReferenceVert { typedef struct ReferenceState { float com[3]; /* center of mass*/ ReferenceVert *ivert; /* list of intial values */ -}ReferenceState; +} ReferenceState; /*private scratch pad for caching and other data only needed when alive*/ @@ -125,7 +125,7 @@ typedef struct SBScratch { int totface; float aabbmin[3],aabbmax[3]; ReferenceState Ref; -}SBScratch; +} SBScratch; typedef struct SB_thread_context { Scene *scene; @@ -140,7 +140,7 @@ typedef struct SB_thread_context { float windfactor; int nr; int tot; -}SB_thread_context; +} SB_thread_context; #define NLF_BUILD 1 #define NLF_SOLVE 2 @@ -267,9 +267,9 @@ float operations still */ static const int CCD_SAVETY = 190561; -typedef struct ccdf_minmax{ -float minx,miny,minz,maxx,maxy,maxz; -}ccdf_minmax; +typedef struct ccdf_minmax { + float minx, miny, minz, maxx, maxy, maxz; +} ccdf_minmax; @@ -283,7 +283,7 @@ typedef struct ccd_Mesh { /* Axis Aligned Bounding Box AABB */ float bbmin[3]; float bbmax[3]; -}ccd_Mesh; +} ccd_Mesh; |