style cleanup: comma placement
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 May 2012 22:45:39 +0000 (22:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 May 2012 22:45:39 +0000 (22:45 +0000)
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/unit.c
source/blender/blenlib/intern/noise.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/transform/transform_conversions.c
source/blender/imbuf/intern/radiance_hdr.c
source/blender/windowmanager/intern/wm_window.c

index 2ba4ab5..e6333ed 100644 (file)
@@ -336,7 +336,8 @@ static int handle_subversion_warning(Main *main, ReportList *reports)
            (main->minversionfile == BLENDER_VERSION &&
             main->minsubversionfile > BLENDER_SUBVERSION))
        {
-               BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);
+               BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary: %d.%d, expect loss of data!",
+                           main->minversionfile, main->minsubversionfile);
        }
 
        return 1;
index 0396733..547a64a 100644 (file)
@@ -538,7 +538,7 @@ void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_
                                break;
                }
        }
-       /* case; beginning with r R l L , with separator after it */
+       /* case; beginning with r R l L, with separator after it */
        else if (is_char_sep(name[1])) {
                switch (name[0]) {
                        case 'l':
index 941e299..9497a81 100644 (file)
@@ -4135,7 +4135,7 @@ static void particles_fluid_step(ParticleSimulationData *sim, int UNUSED(cfra))
                                        pa->dietime = sim->scene->r.efra + 1;
                                        pa->lifetime = sim->scene->r.efra;
                                        pa->alive = PARS_ALIVE;
-                                       //if (a < 25) fprintf(stderr,"FSPARTICLE debug set %s , a%d = %f,%f,%f , life=%f\n", filename, a, pa->co[0],pa->co[1],pa->co[2], pa->lifetime );
+                                       //if (a < 25) fprintf(stderr,"FSPARTICLE debug set %s, a%d = %f,%f,%f, life=%f\n", filename, a, pa->co[0],pa->co[1],pa->co[2], pa->lifetime );
                                }
                                else {
                                        // skip...
index 03afc97..aa9cc40 100644 (file)
@@ -663,7 +663,7 @@ int bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double sca
                                if (*ch == ' ' || *ch == '\t') {
                                        /* do nothing */
                                }
-                               else if (ch_is_op(*ch) || *ch == ',') { /* found an op, no need to insert a ,*/
+                               else if (ch_is_op(*ch) || *ch == ',') { /* found an op, no need to insert a ',' */
                                        op_found = 1;
                                        break;
                                }
index f591dc1..cad4add 100644 (file)
@@ -302,14 +302,14 @@ static float newPerlin(float x, float y, float z)
        w = npfade(z);
        A = hash[X  ]+Y;  AA = hash[A]+Z;  AB = hash[A+1]+Z;      // HASH COORDINATES OF
        B = hash[X+1]+Y;  BA = hash[B]+Z;  BB = hash[B+1]+Z;      // THE 8 CUBE CORNERS,
-       return lerp(w, lerp(v, lerp(u, grad(hash[AA  ], x  , y  , z   ),  // AND ADD
-                                                                                                                               grad(hash[BA  ], x-1, y  , z   )), // BLENDED
-                                                                                               lerp(u, grad(hash[AB  ], x  , y-1, z   ),  // RESULTS
-                                                                                                                               grad(hash[BB  ], x-1, y-1, z   ))),// FROM  8
-                                                               lerp(v, lerp(u, grad(hash[AA+1], x  , y  , z-1 ),  // CORNERS
-                                                                                                                               grad(hash[BA+1], x-1, y  , z-1 )), // OF CUBE
-                                                                                               lerp(u, grad(hash[AB+1], x  , y-1, z-1 ),
-                                                                                                                               grad(hash[BB+1], x-1, y-1, z-1 ))));
+       return lerp(w, lerp(v, lerp(u, grad(hash[AA   ],  x,     y,     z    ),   // AND ADD
+                                      grad(hash[BA   ],  x - 1, y,     z    )),  // BLENDED
+                              lerp(u, grad(hash[AB   ],  x,     y - 1, z    ),   // RESULTS
+                                      grad(hash[BB   ],  x - 1, y - 1, z    ))), // FROM  8
+                      lerp(v, lerp(u, grad(hash[AA + 1], x,     y,     z - 1),   // CORNERS
+                                      grad(hash[BA + 1], x - 1, y,     z - 1)),  // OF CUBE
+                              lerp(u, grad(hash[AB + 1], x,     y - 1, z - 1),
+                                      grad(hash[BB + 1], x - 1, y - 1, z - 1))));
 }
 
 /* for use with BLI_gNoise()/BLI_gTurbulence(), returns unsigned improved perlin noise */
index 361244e..708273d 100644 (file)
@@ -4317,7 +4317,7 @@ typedef struct {
 
 static void edbm_bevel_update_header(wmOperator *op, bContext *C)
 {
-       static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RClick), factor: %f, , Use Dist (D): %s: Use Even (E): %s";
+       static char str[] = "Confirm: Enter/LClick, Cancel: (Esc/RMB), factor: %f, Use Dist (D): %s: Use Even (E): %s";
 
        char msg[HEADER_LENGTH];
        ScrArea *sa = CTX_wm_area(C);
index 1e22179..d9e4619 100644 (file)
@@ -4861,7 +4861,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
                /* marker transform, not especially nice but we may want to move markers
                 * at the same time as keyframes in the dope sheet. */
                if ((sseq->flag & SEQ_MARKER_TRANS) && (canceled == 0)) {
-                       /* cant use TFM_TIME_EXTEND
+                       /* cant use TFM_TIME_EXTEND
                         * for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */
 
                        if (t->mode == TFM_SEQ_SLIDE) {
index 4f4ab9e..29c2e63 100644 (file)
@@ -65,9 +65,9 @@
 #define STR_MAX 540
 typedef unsigned char RGBE[4];
 typedef float fCOLOR[3];
+
 /* copy source -> dest */
-#define copy_rgbe(c1, c2) (c2[RED] = c1[RED], c2[GRN] = c1[GRN], c2[BLU] = c1[BLU], c2[EXP] = c1[EXP])
-#define copy_fcol(f1, f2) (f2[RED] = f1[RED], f2[GRN] = f1[GRN], f2[BLU] = f1[BLU])
+#define COPY_RGBE(c1, c2) (c2[RED] = c1[RED], c2[GRN] = c1[GRN], c2[BLU] = c1[BLU], c2[EXP] = c1[EXP])
 
 /* read routines */
 static unsigned char *oldreadcolrs(RGBE *scan, unsigned char *mem, int xmax)
@@ -80,7 +80,7 @@ static unsigned char *oldreadcolrs(RGBE *scan, unsigned char *mem, int xmax)
                scan[0][EXP] = *mem++;
                if (scan[0][RED] == 1 && scan[0][GRN] == 1 && scan[0][BLU] == 1) {
                        for (i = scan[0][EXP] << rshift; i > 0; i--) {
-                               copy_rgbe(scan[-1], scan[0]);
+                               COPY_RGBE(scan[-1], scan[0]);
                                scan++;
                                len--;
                        }
@@ -272,7 +272,7 @@ static int fwritecolrs(FILE *file, int width, int channels, unsigned char *ibufs
                        fcol[BLU] = (float)((channels >= 3) ? ibufscan[j + 2] : ibufscan[j]) / 255.f;
                }
                FLOAT2RGBE(fcol, rgbe);
-               copy_rgbe(rgbe, rgbe_scan[i]);
+               COPY_RGBE(rgbe, rgbe_scan[i]);
                j += channels;
        }
 
index 95af8aa..e6eff90 100644 (file)
@@ -477,7 +477,7 @@ wmWindow *WM_window_open(bContext *C, rcti *rect)
 
 /* uses screen->temp tag to define what to do, currently it limits
  * to only one "temp" window for render out, preferences, filewindow, etc */
-/* type is #define in WM_api.h */
+/* type is defined in WM_api.h */
 
 void WM_window_open_temp(bContext *C, rcti *position, int type)
 {