[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45827] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Apr 21 15:37:26 CEST 2012
Revision: 45827
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45827
Author: campbellbarton
Date: 2012-04-21 13:37:26 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_particle.h
trunk/blender/source/blender/blenkernel/BKE_pointcache.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
trunk/blender/source/blender/imbuf/intern/bmp.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.h
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
Modified: trunk/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_particle.h 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/blenkernel/BKE_particle.h 2012-04-21 13:37:26 UTC (rev 45827)
@@ -85,7 +85,7 @@
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 @@
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];
Modified: trunk/blender/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pointcache.h 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/blenkernel/BKE_pointcache.h 2012-04-21 13:37:26 UTC (rev 45827)
@@ -187,7 +187,7 @@
#define PEK_HIDE 4
#define PEK_USE_WCO 8
-typedef struct PTCacheEditKey{
+typedef struct PTCacheEditKey {
float *co;
float *vel;
float *rot;
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -274,7 +274,7 @@
}
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;
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -2056,7 +2056,7 @@
/*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++) {
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -2375,6 +2375,7 @@
float massfac;
int use_size;
} SPHRangeData;
+
typedef struct SPHData {
ParticleSystem *psys[10];
ParticleData *pa;
@@ -2390,7 +2391,7 @@
/* 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)
{
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -113,7 +113,7 @@
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 @@
int totface;
float aabbmin[3],aabbmax[3];
ReferenceState Ref;
-}SBScratch;
+} SBScratch;
typedef struct SB_thread_context {
Scene *scene;
@@ -140,7 +140,7 @@
float windfactor;
int nr;
int tot;
-}SB_thread_context;
+} SB_thread_context;
#define NLF_BUILD 1
#define NLF_SOLVE 2
@@ -267,9 +267,9 @@
*/
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 @@
/* Axis Aligned Bounding Box AABB */
float bbmin[3];
float bbmax[3];
-}ccd_Mesh;
+} ccd_Mesh;
Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -84,7 +84,7 @@
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 @@
/* initial uv position */
float initial_uv[2];
-}UVInitialStrokeElement;
+} UVInitialStrokeElement;
typedef struct UVInitialStroke {
/* Initial Selection,for grab brushes for instance */
@@ -106,7 +106,7 @@
/* initial mouse coordinates */
float init_coord[2];
-}UVInitialStroke;
+} UVInitialStroke;
/* custom data for uv smoothing brush */
@@ -142,7 +142,7 @@
/* 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 Temp_UvData {
float sum_co[2], p[2], b[2], sum_b[2];
int ncounter;
-}Temp_UVData;
+} Temp_UVData;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_smart_stitch.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -87,7 +87,7 @@
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 @@
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 PreviewPosition {
int data_position;
int polycount_position;
-}PreviewPosition;
+} PreviewPosition;
/*
* defines for UvElement flags
*/
Modified: trunk/blender/source/blender/imbuf/intern/bmp.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/bmp.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/imbuf/intern/bmp.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -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;
Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -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 @@
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 */
{
Modified: trunk/blender/source/blender/imbuf/intern/png.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/png.c 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/blender/imbuf/intern/png.c 2012-04-21 13:37:26 UTC (rev 45827)
@@ -49,7 +49,7 @@
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);
Modified: trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.h 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.h 2012-04-21 13:37:26 UTC (rev 45827)
@@ -90,7 +90,7 @@
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:
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h 2012-04-21 13:36:57 UTC (rev 45826)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h 2012-04-21 13:37:26 UTC (rev 45827)
@@ -174,7 +174,7 @@
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 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list