From e701f9b67010279db02ceb51f7d08078cb34170a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 29 Apr 2012 15:47:02 +0000 Subject: style cleanup: whitespace / commas --- source/blender/makesdna/DNA_listBase.h | 2 +- source/blender/makesdna/DNA_meshdata_types.h | 2 +- source/blender/makesdna/DNA_node_types.h | 4 ++-- source/blender/makesdna/DNA_object_fluidsim.h | 12 ++++++------ source/blender/makesdna/DNA_object_force.h | 2 +- source/blender/makesdna/DNA_sequence_types.h | 2 +- source/blender/makesdna/DNA_userdef_types.h | 6 +++--- source/blender/makesdna/intern/makesdna.c | 14 +++++++------- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_listBase.h b/source/blender/makesdna/DNA_listBase.h index d0e7a2f4433..35549aee3d2 100644 --- a/source/blender/makesdna/DNA_listBase.h +++ b/source/blender/makesdna/DNA_listBase.h @@ -43,7 +43,7 @@ extern "C" { /* generic - all structs which are used in linked-lists used this */ typedef struct Link { - struct Link *next,*prev; + struct Link *next, *prev; } Link; diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 89ed3ba055f..a0806481aea 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -95,7 +95,7 @@ typedef struct MLoop { typedef struct MTexPoly { struct Image *tpage; char flag, transp; - short mode,tile,unwrap; + short mode, tile, unwrap; } MTexPoly; /* can copy from/to MTexPoly/MTFace */ diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 1abce525be2..01096b6459e 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -375,8 +375,8 @@ typedef struct NodeImageMultiFileSocket { } NodeImageMultiFileSocket; typedef struct NodeChroma { - float t1,t2,t3; - float fsize,fstrength,falpha; + float t1, t2, t3; + float fsize, fstrength, falpha; float key[4]; short algorithm, channel; } NodeChroma; diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h index a55b7b17a22..24bd023af88 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim.h @@ -50,16 +50,16 @@ typedef struct FluidVertexVelocity { typedef struct FluidsimSettings { struct FluidsimModifierData *fmd; /* for fast RNA access */ - /* domain,fluid or obstacle */ + /* domain, fluid or obstacle */ short type; - /* display advanced options in fluid sim tab (on=1,off=0)*/ + /* display advanced options in fluid sim tab (on=1, off=0)*/ short show_advancedoptions; /* domain object settings */ /* resolutions */ short resolutionxyz; short previewresxyz; - /* size of the domain in real units (meters along largest resolution x,y,z extent) */ + /* size of the domain in real units (meters along largest resolution x, y, z extent) */ float realsize; /* show original meshes, preview or final sim */ short guiDisplayMode; @@ -85,7 +85,7 @@ typedef struct FluidsimSettings { /* fluid object type settings */ /* gravity strength */ - float iniVelx,iniVely,iniVelz; + float iniVelx, iniVely, iniVelz; /* store pointer to original mesh (for replacing the current one) */ struct Mesh *orgMesh; @@ -106,8 +106,8 @@ typedef struct FluidsimSettings { /* additional flags depending on the type, lower short contains flags * to check validity, higher short additional flags */ short typeFlags; - /* switch off velocity genration, volume init type for fluid/obstacles (volume=1,shell=2,both=3) */ - char domainNovecgen,volumeInitType; + /* switch off velocity genration, volume init type for fluid/obstacles (volume=1, shell=2, both=3) */ + char domainNovecgen, volumeInitType; /* boundary "stickiness" for part slip values */ float partSlipValue; diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 6fefd2d672f..25c9ad70ea1 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -327,7 +327,7 @@ typedef struct SoftBody { maxloops, choke, solver_ID, - plastic,springpreload + plastic, springpreload ; struct SBScratch *scratch; /* scratch pad/cache on live time not saved in file */ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 0a516c90aa1..cd73b692011 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -208,7 +208,7 @@ typedef struct Editing { /* ************* Effect Variable Structs ********* */ typedef struct WipeVars { - float edgeWidth,angle; + float edgeWidth, angle; short forward, wipetype; } WipeVars; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 40c4a7fab9d..94c4d141a57 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -205,7 +205,7 @@ typedef struct ThemeSpace { char grid[4]; char wire[4], select[4]; - char lamp[4], speaker[4], empty[4],camera[4], pad[8]; + char lamp[4], speaker[4], empty[4], camera[4], pad[8]; char active[4], group[4], group_active[4], transform[4]; char vertex[4], vertex_select[4]; char edge[4], edge_select[4]; @@ -376,13 +376,13 @@ typedef struct UserDef { short tb_leftmouse, tb_rightmouse; struct SolidLight light[3]; short tw_hotspot, tw_flag, tw_handlesize, tw_size; - short textimeout,texcollectrate; + short textimeout, texcollectrate; short wmdrawmethod; /* removed wmpad */ short dragthreshold; int memcachelimit; int prefetchframes; short frameserverport; - short pad_rot_angle; /*control the rotation step of the view when PAD2,PAD4,PAD6&PAD8 is use*/ + short pad_rot_angle; /*control the rotation step of the view when PAD2, PAD4, PAD6&PAD8 is use*/ short obcenter_dia; short rvisize; /* rotating view icon size */ short rvibright; /* rotating view icon brightness */ diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index f9572e1313a..adcdf5df106 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -360,8 +360,8 @@ static int add_name(const char *str) * */ buf[i] = 0; if (debugSDNA > 3) printf("Name before chomping: %s\n", buf); - if ((strncmp(buf,"(*headdraw", 10) == 0) || - (strncmp(buf,"(*windraw", 9) == 0) ) + if ((strncmp(buf, "(*headdraw", 10) == 0) || + (strncmp(buf, "(*windraw", 9) == 0) ) { buf[i] = ')'; buf[i+1] = '('; @@ -766,7 +766,7 @@ static int calculate_structlens(int firststruct) } if (alphalen % 8) { - printf("Align pointer error in struct (alphalen8): %s %s\n", types[structtype],cp); + printf("Align pointer error in struct (alphalen8): %s %s\n", types[structtype], cp); dna_error = 1; } @@ -792,7 +792,7 @@ static int calculate_structlens(int firststruct) /* struct alignment */ if (type >= firststruct) { if (sizeof(void *)==8 && (len % 8) ) { - printf("Align struct error: %s %s\n", types[structtype],cp); + printf("Align struct error: %s %s\n", types[structtype], cp); dna_error = 1; } } @@ -890,7 +890,7 @@ void dna_write(FILE *file, void *pntr, int size) data = (char *) pntr; for (i = 0 ; i < size ; i++) { - fprintf(file, "%d,", data[i]); + fprintf(file, "%d, ", data[i]); linelength++; if (linelength >= MAX_DNA_LINE_LENGTH) { fprintf(file, "\n"); @@ -989,7 +989,7 @@ static int make_structDNA(char *baseDirectory, FILE *file) /* FOR DEBUG */ if (debugSDNA > 1) { - int a,b; + int a, b; /* short *elem; */ short num_types; @@ -1007,7 +1007,7 @@ static int make_structDNA(char *baseDirectory, FILE *file) for (a=0; a