From 2ab62ce126651c600a8039de0dd95a4e3c02ea47 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 27 May 2012 12:21:13 +0000 Subject: code cleanup: defines with braces - end with '(void)0' so callers must end with ';' like normal function. ... without this some editors dont parse the source so well. --- source/blender/render/intern/include/rendercore.h | 5 ---- .../blender/render/intern/source/pixelblending.c | 30 ++++++++++++++-------- source/blender/render/intern/source/shadeoutput.c | 8 ++++++ source/blender/render/intern/source/zbuf.c | 2 +- 4 files changed, 29 insertions(+), 16 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index a66165d4680..284b386ca33 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -34,11 +34,6 @@ #include "render_types.h" - -/* vector defines */ - -#define CROSS(dest, a, b) { dest[0]= a[1] * b[2] - a[2] * b[1]; dest[1]= a[2] * b[0] - a[0] * b[2]; dest[2]= a[0] * b[1] - a[1] * b[0]; } - struct HaloRen; struct ShadeInput; struct ShadeResult; diff --git a/source/blender/render/intern/source/pixelblending.c b/source/blender/render/intern/source/pixelblending.c index 151464064cb..b282cc8459f 100644 --- a/source/blender/render/intern/source/pixelblending.c +++ b/source/blender/render/intern/source/pixelblending.c @@ -306,17 +306,27 @@ void add_filt_fmask_coord(float filt[][3], const float col[4], float *rowbuf, in /* loop unroll */ -#define MASKFILT(i, j) val= lfilt[i][j]; if (val!=0.0f) {float *fp= fpoin[i][j]; fp[0]+= val*r; fp[1]+= val*g; fp[2]+= val*b; fp[3]+= val*al; } +#define MASKFILT(i, j) \ + val = lfilt[i][j]; \ + if (val != 0.0f) { \ + float *fp = fpoin[i][j]; \ + fp[0] += val * r; \ + fp[1] += val * g; \ + fp[2] += val * b; \ + fp[3] += val * al; \ + } (void)0 - MASKFILT(0, 0) - MASKFILT(0, 1) - MASKFILT(0, 2) - MASKFILT(1, 0) - MASKFILT(1, 1) - MASKFILT(1, 2) - MASKFILT(2, 0) - MASKFILT(2, 1) - MASKFILT(2, 2) + MASKFILT(0, 0); + MASKFILT(0, 1); + MASKFILT(0, 2); + MASKFILT(1, 0); + MASKFILT(1, 1); + MASKFILT(1, 2); + MASKFILT(2, 0); + MASKFILT(2, 1); + MASKFILT(2, 2); + +#undef MASKFILT } void add_filt_fmask_pixsize(unsigned int mask, float *in, float *rowbuf, int row_w, int pixsize) diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index f842dc0ff1b..82f2add7c3d 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -451,11 +451,19 @@ static float area_lamp_energy(float (*area)[3], const float co[3], const float v Normalize_d(vec[3]); /* cross product */ +#define CROSS(dest, a, b) \ + { dest[0]= a[1] * b[2] - a[2] * b[1]; \ + dest[1]= a[2] * b[0] - a[0] * b[2]; \ + dest[2]= a[0] * b[1] - a[1] * b[0]; \ + } (void)0 + CROSS(cross[0], vec[0], vec[1]); CROSS(cross[1], vec[1], vec[2]); CROSS(cross[2], vec[2], vec[3]); CROSS(cross[3], vec[3], vec[0]); +#undef CROSS + Normalize_d(cross[0]); Normalize_d(cross[1]); Normalize_d(cross[2]); diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 8484e82c66c..ecde9bb2de8 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -1982,7 +1982,7 @@ void zbufclip4(ZSpan *zspan, int obi, int zvlnr, float *f1, float *f2, float *f3 /* ************** ZMASK ******************************** */ -#define EXTEND_PIXEL(a) if (temprectp[a]) {z+= rectz[a]; tot++;} +#define EXTEND_PIXEL(a) if (temprectp[a]) { z += rectz[a]; tot++; } (void)0 /* changes the zbuffer to be ready for z-masking: applies an extend-filter, and then clears */ static void zmask_rect(int *rectz, int *rectp, int xs, int ys, int neg) -- cgit v1.2.3