Revision: 46608
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46608
Author: campbellbarton
Date: 2012-05-13 16:05:10 +0000 (Sun, 13 May 2012)
Log Message:
-----------
style cleanup: macro line breaks
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-05-13 16:01:59 UTC (rev 46607)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
2012-05-13 16:05:10 UTC (rev 46608)
@@ -991,23 +991,25 @@
glShadeModel(GL_SMOOTH);
BM_mesh_elem_index_ensure(bm, BM_VERT | BM_FACE);
-#define PASSATTRIB(loop, eve, vert) {
\
+#define PASSATTRIB(loop, eve, vert) {
\
if (attribs.totorco) {
\
float *orco =
attribs.orco.array[BM_elem_index_get(eve)]; \
glVertexAttrib3fvARB(attribs.orco.gl_index, orco);
\
}
\
for (b = 0; b < attribs.tottface; b++) {
\
- MLoopUV *_luv = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, CD_MLOOPUV, b); \
+ MLoopUV *_luv = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, \
+ CD_MLOOPUV, b);
\
glVertexAttrib2fvARB(attribs.tface[b].gl_index,
_luv->uv); \
}
\
for (b = 0; b < attribs.totmcol; b++) {
\
- MLoopCol *_cp = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, CD_MLOOPCOL, b); \
+ MLoopCol *_cp = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, \
+ CD_MLOOPCOL, b);
\
GLubyte _col[4];
\
- _col[0] = _cp->b; _col[1] = _cp->g; _col[2] = _cp->r;
_col[3] = _cp->a; \
+ _col[0] = _cp->b; _col[1] = _cp->g; _col[2] = _cp->r;
_col[3] = _cp->a; \
glVertexAttrib4ubvARB(attribs.mcol[b].gl_index, _col);
\
}
\
if (attribs.tottang) {
\
- float *tang = attribs.tang.array[i * 4 + vert];
\
+ float *tang = attribs.tang.array[i * 4 + vert];
\
glVertexAttrib3fvARB(attribs.tang.gl_index, tang);
\
}
\
}
@@ -1112,7 +1114,7 @@
BM_mesh_elem_index_ensure(bm, BM_VERT | BM_FACE);
-#define PASSATTRIB(loop, eve, vert) {
\
+#define PASSATTRIB(loop, eve, vert) {
\
if (attribs.totorco) {
\
float *orco =
attribs.orco.array[BM_elem_index_get(eve)]; \
if (attribs.orco.gl_texco)
\
@@ -1121,20 +1123,22 @@
glVertexAttrib3fvARB(attribs.orco.gl_index,
orco); \
}
\
for (b = 0; b < attribs.tottface; b++) {
\
- MLoopUV *_luv = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, CD_MLOOPUV, b); \
+ MLoopUV *_luv = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, \
+ CD_MLOOPUV, b);
\
if (attribs.tface[b].gl_texco)
\
glTexCoord2fv(_luv->uv);
\
else
\
glVertexAttrib2fvARB(attribs.tface[b].gl_index,
_luv->uv); \
}
\
for (b = 0; b < attribs.totmcol; b++) {
\
- MLoopCol *_cp = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, CD_MLOOPCOL, b); \
+ MLoopCol *_cp = CustomData_bmesh_get_n(&bm->ldata,
loop->head.data, \
+ CD_MLOOPCOL, b);
\
GLubyte _col[4];
\
- _col[0] = _cp->b; _col[1] = _cp->g; _col[2] = _cp->r;
_col[3] = _cp->a; \
+ _col[0] = _cp->b; _col[1] = _cp->g; _col[2] = _cp->r;
_col[3] = _cp->a; \
glVertexAttrib4ubvARB(attribs.mcol[b].gl_index, _col);
\
}
\
if (attribs.tottang) {
\
- float *tang = attribs.tang.array[i * 4 + vert];
\
+ float *tang = attribs.tang.array[i * 4 + vert];
\
glVertexAttrib4fvARB(attribs.tang.gl_index, tang);
\
}
\
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
