[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52318] trunk/blender: style cleanup: if' s on the same line.
Campbell Barton
ideasman42 at gmail.com
Sun Nov 18 03:42:02 CET 2012
Revision: 52318
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52318
Author: campbellbarton
Date: 2012-11-18 02:41:55 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
style cleanup: if's on the same line.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/blender/avi/intern/avi_rgb.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/imbuf/intern/scaling.c
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-11-18 02:41:55 UTC (rev 52318)
@@ -1591,13 +1591,17 @@
if ((dx == 0) && (dy == 0)) break;
/* Quadratic acceleration */
- dx = dx*(fabs(dx)+0.5);
- if (dx<0.0) dx-=0.5; else dx+=0.5;
- if (dx< -deltaMax) dx= -deltaMax; else if (dx>deltaMax) dx=deltaMax;
+ dx = dx*(fabs(dx) + 0.5);
+ if (dx < 0.0) dx -= 0.5;
+ else dx += 0.5;
+ if (dx < -deltaMax) dx = -deltaMax;
+ else if (dx > deltaMax) dx = deltaMax;
- dy = dy*(fabs(dy)+0.5);
- if (dy<0.0) dy-=0.5; else dy+=0.5;
- if (dy< -deltaMax) dy= -deltaMax; else if (dy>deltaMax) dy=deltaMax;
+ dy = dy*(fabs(dy) + 0.5);
+ if (dy < 0.0) dy -= 0.5;
+ else dy += 0.5;
+ if (dy < -deltaMax) dy= -deltaMax;
+ else if (dy > deltaMax) dy= deltaMax;
window->clientToScreenIntern(mousePos.x, mousePos.y, x, y);
dy = -dy;
Modified: trunk/blender/source/blender/avi/intern/avi_rgb.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi_rgb.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/avi/intern/avi_rgb.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -98,7 +98,7 @@
buf = MEM_mallocN(movie->header->Height * movie->header->Width * 3, "fromavirgbbuf");
rowstride = movie->header->Width * 3;
- if (bits != 16) if (movie->header->Width % 2) rowstride++;
+ if ((bits != 16) && (movie->header->Width % 2)) rowstride++;
for (y = 0; y < movie->header->Height; y++) {
memcpy(&buf[y * movie->header->Width * 3], &buffer[((movie->header->Height - 1) - y) * rowstride], movie->header->Width * 3);
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -1116,7 +1116,7 @@
*fp = basisu[i] * bp->vec[3];
sumdiv += *fp;
}
- if (sumdiv != 0.0f) if (sumdiv < 0.999f || sumdiv > 1.001f) {
+ if ((sumdiv != 0.0f) && (sumdiv < 0.999f || sumdiv > 1.001f)) {
/* is normalizing needed? */
fp = sum;
for (i = istart; i <= iend; i++, fp++) {
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -1520,7 +1520,9 @@
/* search for id */
idtest = BLI_findstring(lb, name, offsetof(ID, name) + 2);
- if (idtest) if (new_id(lb, idtest, name) == 0) id_sort_by_name(lb, idtest);
+ if (idtest && (new_id(lb, idtest, name) == 0)) {
+ id_sort_by_name(lb, idtest);
+ }
}
void text_idbutton(struct ID *id, char *text)
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -3786,14 +3786,22 @@
return 1;
}
-#define SET_PARTICLE_TEXTURE(type, pvalue, texfac) \
- if ((event & mtex->mapto) & type) { pvalue = texture_value_blend(def, pvalue, value, texfac, blend); } (void)0
+#define SET_PARTICLE_TEXTURE(type, pvalue, texfac) \
+ if ((event & mtex->mapto) & type) { \
+ pvalue = texture_value_blend(def, pvalue, value, texfac, blend); \
+ } (void)0
-#define CLAMP_PARTICLE_TEXTURE_POS(type, pvalue) \
- if (event & type) { if (pvalue < 0.0f) pvalue = 1.0f + pvalue; CLAMP(pvalue, 0.0f, 1.0f); } (void)0
+#define CLAMP_PARTICLE_TEXTURE_POS(type, pvalue) \
+ if (event & type) { \
+ if (pvalue < 0.0f) \
+ pvalue = 1.0f + pvalue; \
+ CLAMP(pvalue, 0.0f, 1.0f); \
+ } (void)0
-#define CLAMP_PARTICLE_TEXTURE_POSNEG(type, pvalue) \
- if (event & type) { CLAMP(pvalue, -1.0f, 1.0f); } (void)0
+#define CLAMP_PARTICLE_TEXTURE_POSNEG(type, pvalue) \
+ if (event & type) { \
+ CLAMP(pvalue, -1.0f, 1.0f); \
+ } (void)0
static void get_cpa_texture(DerivedMesh *dm, ParticleSystem *psys, ParticleSettings *part, ParticleData *par, int child_index, int face_index, const float fw[4], float *orco, ParticleTexture *ptex, int event, float cfra)
{
@@ -3802,8 +3810,8 @@
float value, rgba[4], texvec[3];
ptex->ivel = ptex->life = ptex->exist = ptex->size = ptex->damp =
- ptex->gravity = ptex->field = ptex->time = ptex->clump = ptex->kink =
- ptex->effector = ptex->rough1 = ptex->rough2 = ptex->roughe = 1.f;
+ ptex->gravity = ptex->field = ptex->time = ptex->clump = ptex->kink =
+ ptex->effector = ptex->rough1 = ptex->rough2 = ptex->roughe = 1.0f;
ptex->length = 1.0f - part->randlength * PSYS_FRAND(child_index + 26);
ptex->length *= part->clength_thres < PSYS_FRAND(child_index + 27) ? part->clength : 1.0f;
Modified: trunk/blender/source/blender/blenlib/intern/noise.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/noise.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/blenlib/intern/noise.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -398,7 +398,8 @@
h = hashvectf + 3 * hash[b21 + b11];
n += i * (h[0] * jx + h[1] * jy + h[2] * jz);
- if (n < 0.0f) n = 0.0f; else if (n > 1.0f) n = 1.0f;
+ if (n < 0.0f) n = 0.0f;
+ else if (n > 1.0f) n = 1.0f;
return n;
}
@@ -1890,7 +1891,8 @@
y *= lacunarity;
z *= lacunarity;
weight = signal * gain;
- if (weight > 1.0f) weight = 1.0f; else if (weight < 0.0f) weight = 0.0f;
+ if (weight > 1.0f) weight = 1.0f;
+ else if (weight < 0.0f) weight = 0.0f;
signal = offset - fabsf(noisefunc(x, y, z));
signal *= signal;
signal *= weight;
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -3678,10 +3678,12 @@
/* what about resolu == 2? */
bp = &nu->bp[u];
for (v = 0; v < nu->pntsv - 1; v++, bp += nu->pntsu) {
- if (v) if (bp->f1 & SELECT) return 1;
+ if ((v != 0) && (bp->f1 & SELECT)) {
+ return TRUE;
+ }
}
- return 0;
+ return FALSE;
}
typedef struct NurbSort {
@@ -6464,7 +6466,7 @@
bp->vec[0] += fac * grid;
fac = (float)b - 1.5f;
bp->vec[1] += fac * grid;
- if (a == 1 || a == 2) if (b == 1 || b == 2) {
+ if ((a == 1 || a == 2) && (b == 1 || b == 2)) {
bp->vec[2] += grid;
}
mul_m4_v3(mat, bp->vec);
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -1409,8 +1409,8 @@
dir1 &= (UI_TOP | UI_DOWN);
}
- if (dir2 == 0) if (dir1 == UI_LEFT || dir1 == UI_RIGHT) dir2 = UI_DOWN;
- if (dir2 == 0) if (dir1 == UI_TOP || dir1 == UI_DOWN) dir2 = UI_LEFT;
+ if ((dir2 == 0) && (dir1 == UI_LEFT || dir1 == UI_RIGHT)) dir2 = UI_DOWN;
+ if ((dir2 == 0) && (dir1 == UI_TOP || dir1 == UI_DOWN)) dir2 = UI_LEFT;
/* no space at all? don't change */
if (left || right) {
Modified: trunk/blender/source/blender/imbuf/intern/scaling.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/scaling.c 2012-11-18 01:43:16 UTC (rev 52317)
+++ trunk/blender/source/blender/imbuf/intern/scaling.c 2012-11-18 02:41:55 UTC (rev 52318)
@@ -1467,10 +1467,10 @@
return ibuf;
}
- if (newx < ibuf->x) if (newx) scaledownx(ibuf, newx);
- if (newy < ibuf->y) if (newy) scaledowny(ibuf, newy);
- if (newx > ibuf->x) if (newx) scaleupx(ibuf, newx);
- if (newy > ibuf->y) if (newy) scaleupy(ibuf, newy);
+ if (newx && (newx < ibuf->x)) scaledownx(ibuf, newx);
+ if (newy && (newy < ibuf->y)) scaledowny(ibuf, newy);
+ if (newx && (newx > ibuf->x)) scaleupx(ibuf, newx);
+ if (newy && (newy > ibuf->y)) scaleupy(ibuf, newy);
return(ibuf);
}
More information about the Bf-blender-cvs
mailing list