[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46958] trunk/blender/source/blender: style cleanup: comma placement
Campbell Barton
ideasman42 at gmail.com
Thu May 24 00:45:39 CEST 2012
Revision: 46958
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46958
Author: campbellbarton
Date: 2012-05-23 22:45:39 +0000 (Wed, 23 May 2012)
Log Message:
-----------
style cleanup: comma placement
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/unit.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -336,7 +336,8 @@
(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;
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -538,7 +538,7 @@
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':
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -4135,7 +4135,7 @@
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...
Modified: trunk/blender/source/blender/blenkernel/intern/unit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/unit.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/blenkernel/intern/unit.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -663,7 +663,7 @@
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;
}
Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/blenlib/intern/noise.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -302,14 +302,14 @@
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 */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -4317,7 +4317,7 @@
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);
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -4861,7 +4861,7 @@
/* 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) {
Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -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 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c 2012-05-23 22:22:06 UTC (rev 46957)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c 2012-05-23 22:45:39 UTC (rev 46958)
@@ -477,7 +477,7 @@
/* 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)
{
More information about the Bf-blender-cvs
mailing list