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; diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index 4b866c3c9c3..b4f8f689a6a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -84,7 +84,7 @@ typedef struct UvEdge { unsigned int uv2; /* general use flag (Used to check if edge is boundary here, and propagates to adjacency elements) */ char flag; -}UvEdge; +} UvEdge; typedef struct UVInitialStrokeElement { /* index to unique uv */ @@ -95,7 +95,7 @@ typedef struct UVInitialStrokeElement { /* initial uv position */ float initial_uv[2]; -}UVInitialStrokeElement; +} UVInitialStrokeElement; typedef struct UVInitialStroke { /* Initial Selection,for grab brushes for instance */ @@ -106,7 +106,7 @@ typedef struct UVInitialStroke { /* initial mouse coordinates */ float init_coord[2]; -}UVInitialStroke; +} UVInitialStroke; /* custom data for uv smoothing brush */ @@ -142,7 +142,7 @@ typedef struct UvSculptData { /* store invert flag here */ char invert; -}UvSculptData; +} UvSculptData; /*********** Improved Laplacian Relaxation Operator ************************/ /* original code by Raul Fernandez Hernandez "farsthary" * @@ -152,7 +152,7 @@ typedef struct UvSculptData { typedef struct Temp_UvData { float sum_co[2], p[2], b[2], sum_b[2]; int ncounter; -}Temp_UVData; +} Temp_UVData; diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index 53572f114d2..448072ebb72 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -87,7 +87,7 @@ typedef struct IslandStitchData { char stitchableCandidate; /* if edge rotation is used, flag so that vertex rotation is not used */ char use_edge_rotation; -}IslandStitchData; +} IslandStitchData; /* just for averaging UVs */ typedef struct UVVertAverage { @@ -103,7 +103,7 @@ typedef struct UvEdge { char flag; /* element that guarantees element->face has the face on element->tfindex and element->tfindex+1 is the second uv */ UvElement *element; -}UvEdge; +} UvEdge; /* stitch state object */ @@ -146,7 +146,7 @@ typedef struct StitchState { typedef struct PreviewPosition { int data_position; int polycount_position; -}PreviewPosition; +} PreviewPosition; /* * defines for UvElement flags */ diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index 768aa518742..06e1d75c5d0 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -44,7 +44,7 @@ * http://www.microsoft.com/msj/defaultframe.asp?page=/msj/0197/mfcp1/mfcp1.htm&nav=/msj/0197/newnav.htm */ -typedef struct BMPINFOHEADER{ +typedef struct BMPINFOHEADER { unsigned int biSize; unsigned int biWidth; unsigned int biHeight; diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 275d19d518c..749d46d3a98 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -43,7 +43,7 @@ static char JP2_HEAD[]= {0x0, 0x0, 0x0, 0x0C, 0x6A, 0x50, 0x20, 0x20, 0x0D, 0x0A, 0x87, 0x0A}; /* We only need this because of how the presets are set */ -typedef struct img_folder{ +typedef struct img_folder { /** The directory path of the folder containing input images*/ char *imgdirpath; /** Output format*/ @@ -54,7 +54,7 @@ typedef struct img_folder{ char set_out_format; /** User specified rate stored in case of cinema option*/ float *rates; -}img_fol_t; +} img_fol_t; static int check_jp2(unsigned char *mem) /* J2K_CFMT */ { diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index de935c7cc42..74e1a4084c2 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -49,7 +49,7 @@ typedef struct PNGReadStruct { unsigned char *data; unsigned int size; unsigned int seek; -}PNGReadStruct; +} PNGReadStruct; static void ReadData( png_structp png_ptr, png_bytep data, png_size_t length); static void WriteData( png_structp png_ptr, png_bytep data, png_size_t length); diff --git a/source/gameengine/Ketsji/KX_ObstacleSimulation.h b/source/gameengine/Ketsji/KX_ObstacleSimulation.h index d9bda34f112..5b359fc031e 100644 --- a/source/gameengine/Ketsji/KX_ObstacleSimulation.h +++ b/source/gameengine/Ketsji/KX_ObstacleSimulation.h @@ -90,7 +90,7 @@ public: virtual void AdjustObstacleVelocity(KX_Obstacle* activeObst, KX_NavMeshObject* activeNavMeshObj, MT_Vector3& velocity, MT_Scalar maxDeltaSpeed,MT_Scalar maxDeltaAngle); -}; +}; class KX_ObstacleSimulationTOI: public KX_ObstacleSimulation { protected: diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h index ddf889aeb37..fc5adc97657 100644 --- a/source/gameengine/Rasterizer/RAS_FramingManager.h +++ b/source/gameengine/Rasterizer/RAS_FramingManager.h @@ -174,7 +174,7 @@ struct RAS_FrameFrustum float camnear,camfar; float x1,y1; float x2,y2; -}; +}; /* must match R_CULLING_... from DNA_scene_types.h */ enum RAS_CullingMode @@ -307,7 +307,7 @@ public: void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FramingManager"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif -}; - +}; + #endif diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h index 77172256ef9..689ada84edd 100644 --- a/source/gameengine/SceneGraph/SG_ParentRelation.h +++ b/source/gameengine/SceneGraph/SG_ParentRelation.h @@ -136,7 +136,7 @@ public: void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_ParentRelation"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif -}; +}; #endif