Revision: 46711
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46711
Author: campbellbarton
Date: 2012-05-17 07:59:25 +0000 (Thu, 17 May 2012)
Log Message:
-----------
style cleanup: line length and ensure some macros error when not ending with ';'
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-17 03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2012-05-17 07:59:25 UTC (rev 46711)
@@ -522,7 +522,7 @@
glNormal3sv(no);
\
}
\
glVertex3fv(mvert[index].co); \
-}
+} (void)0
if (cddm->pbvh && cddm->pbvh_draw) {
if (dm->numTessFaceData) {
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-05-17 03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-05-17 07:59:25 UTC (rev 46711)
@@ -1012,7 +1012,7 @@
float *tang = attribs.tang.array[i * 4 + vert];
\
glVertexAttrib3fvARB(attribs.tang.gl_index, tang);
\
}
\
-}
+ } (void)0
for (i = 0, ltri = em->looptris[0]; i < em->tottri; i++, ltri += 3) {
@@ -1141,7 +1141,7 @@
float *tang = attribs.tang.array[i * 4 + vert];
\
glVertexAttrib4fvARB(attribs.tang.gl_index, tang);
\
}
\
-}
+ } (void)0
for (i = 0, ltri = em->looptris[0]; i < em->tottri; i++, ltri += 3) {
int drawSmooth;
Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c 2012-05-17
03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c 2012-05-17
07:59:25 UTC (rev 46711)
@@ -299,7 +299,8 @@
s_i = p_i[0]; p_i[0] = p_i[7]; p_i[7] = s_i; \
s_i = p_i[1]; p_i[1] = p_i[6]; p_i[6] = s_i; \
s_i = p_i[2]; p_i[2] = p_i[5]; p_i[5] = s_i; \
- s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i; }
+ s_i = p_i[3]; p_i[3] = p_i[4]; p_i[4] = s_i; \
+ } (void)0
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-05-17
03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-05-17
07:59:25 UTC (rev 46711)
@@ -2177,7 +2177,8 @@
flag = IB_rect | IB_multilayer;
if (ima->flag & IMA_DO_PREMUL) flag |= IB_premul;
- ibuf = IMB_ibImageFromMemory((unsigned char
*)ima->packedfile->data, ima->packedfile->size, flag, "<packed data>");
+ ibuf = IMB_ibImageFromMemory((unsigned char
*)ima->packedfile->data,
+ ima->packedfile->size, flag,
"<packed data>");
}
else {
flag = IB_rect | IB_multilayer | IB_metadata;
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-17
03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-17
07:59:25 UTC (rev 46711)
@@ -2092,8 +2092,9 @@
mp->mat_nr = mf->mat_nr;
mp->flag = mf->flag;
-# define ML(v1, v2) {ml->v = mf->v1; ml->e =
GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2)); ml++; j++; \
-}
+# define ML(v1, v2) { \
+ ml->v = mf->v1; ml->e =
GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, mf->v1, mf->v2)); ml++; j++; \
+ } (void)0
ML(v1, v2);
ML(v2, v3);
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-05-17 03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
2012-05-17 07:59:25 UTC (rev 46711)
@@ -1816,7 +1816,7 @@
float *tang = attribs.tang.array[a * 4 + vert];
\
glVertexAttrib4fvARB(attribs.tang.gl_index, tang);
\
}
\
-}
+} (void)0
totface = ccgSubSurf_getNumFaces(ss);
for (a = 0, i = 0; i < totface; i++) {
@@ -1972,7 +1972,7 @@
float *tang = attribs.tang.array[a * 4 + vert];
\
glVertexAttrib4fvARB(attribs.tang.gl_index, tang);
\
}
\
-}
+} (void)0
totface = ccgSubSurf_getNumFaces(ss);
for (a = 0, i = 0; i < totface; i++) {
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-17
03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-05-17
07:59:25 UTC (rev 46711)
@@ -231,7 +231,8 @@
s_i=p_i[0]; p_i[0]=p_i[7]; p_i[7]=s_i; \
s_i=p_i[1]; p_i[1]=p_i[6]; p_i[6]=s_i; \
s_i=p_i[2]; p_i[2]=p_i[5]; p_i[5]=s_i; \
- s_i=p_i[3]; p_i[3]=p_i[4]; p_i[4]=s_i; }
+ s_i=p_i[3]; p_i[3]=p_i[4]; p_i[4]=s_i; \
+} (void)0
/***/
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c
2012-05-17 03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c
2012-05-17 07:59:25 UTC (rev 46711)
@@ -379,7 +379,7 @@
/* ... standard sub-channel filtering can go on here now ... */
#define END_ANIMFILTER_SUBCHANNELS \
filter_mode = _filter; \
- }
+ } (void)0
/* ............................... */
@@ -447,7 +447,7 @@
} \
} \
} \
- }
+ } (void)0
/* ............................... */
@@ -467,7 +467,7 @@
items ++; \
ale_statement \
} \
- }
+ } (void)0
#define ANIMCHANNEL_NEW_CHANNEL(channel_data, channel_type, owner_id) \
ANIMCHANNEL_NEW_CHANNEL_FULL(channel_data, channel_type, owner_id, {})
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c
2012-05-17 03:18:47 UTC (rev 46710)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c
2012-05-17 07:59:25 UTC (rev 46711)
@@ -252,7 +252,8 @@
/* linear vertical shade within button or in outline */
/* view2d scrollers use it */
-void uiDrawBoxVerticalShade(int mode, float minx, float miny, float maxx,
float maxy, float rad, float shadeLeft, float shadeRight)
+void uiDrawBoxVerticalShade(int mode, float minx, float miny, float maxx,
float maxy,
+ float rad, float shadeLeft, float shadeRight)
{
float vec[7][2] = {{0.195, 0.02}, {0.383, 0.067}, {0.55, 0.169},
{0.707, 0.293},
{0.831, 0.45}, {0.924, 0.617},
{0.98, 0.805}};
@@ -656,7 +657,8 @@
uiDrawBox(GL_LINE_LOOP, rect->xmin - 1, rect->ymin, rect->xmax + 1,
rect->ymax + 1, 3.0f);
}
-static void histogram_draw_one(float r, float g, float b, float alpha, float
x, float y, float w, float h, float *data, int res)
+static void histogram_draw_one(float r, float g, float b, float alpha,
+ float x, float y, float w, float h, float
*data, int res)
{
int i;
@@ -716,7 +718,10 @@
/* need scissor test, histogram can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor);
- glScissor(ar->winrct.xmin + (rect.xmin - 1), ar->winrct.ymin +
(rect.ymin - 1), (rect.xmax + 1) - (rect.xmin - 1), (rect.ymax + 1) -
(rect.ymin - 1));
+ glScissor(ar->winrct.xmin + (rect.xmin - 1),
+ ar->winrct.ymin + (rect.ymin - 1),
+ (rect.xmax + 1) - (rect.xmin - 1),
+ (rect.ymax + 1) - (rect.ymin - 1));
glColor4f(1.f, 1.f, 1.f, 0.08f);
/* draw grid lines here */
@@ -786,7 +791,10 @@
/* need scissor test, waveform can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor);
- glScissor(ar->winrct.xmin + (rect.xmin - 1), ar->winrct.ymin +
(rect.ymin - 1), (rect.xmax + 1) - (rect.xmin - 1), (rect.ymax + 1) -
(rect.ymin - 1));
+ glScissor(ar->winrct.xmin + (rect.xmin - 1),
+ ar->winrct.ymin + (rect.ymin - 1),
+ (rect.xmax + 1) - (rect.xmin - 1),
+ (rect.ymax + 1) - (rect.ymin - 1));
glColor4f(1.f, 1.f, 1.f, 0.08f);
/* draw grid lines here */
@@ -851,7 +859,12 @@
}
/* RGB / YCC (3 channels) */
- else if (ELEM4(scopes->wavefrm_mode, SCOPES_WAVEFRM_RGB,
SCOPES_WAVEFRM_YCC_601, SCOPES_WAVEFRM_YCC_709, SCOPES_WAVEFRM_YCC_JPEG)) {
+ else if (ELEM4(scopes->wavefrm_mode,
+ SCOPES_WAVEFRM_RGB,
+ SCOPES_WAVEFRM_YCC_601,
+ SCOPES_WAVEFRM_YCC_709,
+ SCOPES_WAVEFRM_YCC_JPEG))
+ {
int rgb = (scopes->wavefrm_mode == SCOPES_WAVEFRM_RGB);
glBlendFunc(GL_ONE, GL_ONE);
@@ -996,7 +1009,10 @@
/* need scissor test, hvectorscope can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor);
- glScissor(ar->winrct.xmin + (rect.xmin - 1), ar->winrct.ymin +
(rect.ymin - 1), (rect.xmax + 1) - (rect.xmin - 1), (rect.ymax + 1) -
(rect.ymin - 1));
+ glScissor(ar->winrct.xmin + (rect.xmin - 1),
+ ar->winrct.ymin + (rect.ymin - 1),
+ (rect.xmax + 1) - (rect.xmin - 1),
+ (rect.ymax + 1) - (rect.ymin - 1));
glColor4f(1.f, 1.f, 1.f, 0.08f);
/* draw grid elements */
@@ -1507,7 +1523,10 @@
/* need scissor test, preview image can draw outside of boundary */
glGetIntegerv(GL_VIEWPORT, scissor);
- glScissor(ar->winrct.xmin + (rect.xmin - 1), ar->winrct.ymin +
(rect.ymin - 1), (rect.xmax + 1) - (rect.xmin - 1), (rect.ymax + 1) -
(rect.ymin - 1));
+ glScissor(ar->winrct.xmin + (rect.xmin - 1),
+ ar->winrct.ymin + (rect.ymin - 1),
+ (rect.xmax + 1) - (rect.xmin - 1),
+ (rect.ymax + 1) - (rect.ymin - 1));
if (scopes->track_disabled) {
glColor4f(0.7f, 0.3f, 0.3f, 0.3f);
@@ -1550,7 +1569,10 @@
/* draw cross for pizel position */
glTranslatef(off_x + rect.xmin + track_pos[0] * zoomx,
off_y + rect.ymin + track_pos[1] * zoomy, 0.f);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
