[Bf-blender-cvs] [14e4747] master: cleanup: macro whitespace \ alignment

Mike Erwin noreply at git.blender.org
Mon Sep 5 19:31:19 CEST 2016


Commit: 14e47472fe00e3d66d2ba14fb19bcfc86c0daad5
Author: Mike Erwin
Date:   Mon Sep 5 13:30:57 2016 -0400
Branches: master
https://developer.blender.org/rB14e47472fe00e3d66d2ba14fb19bcfc86c0daad5

cleanup: macro whitespace \ alignment

Gotta be careful mixing tabs & spaces. This commit uses 4-space indent
to align the line continuation markers.

Follow-up to 3b52c4056aaf

===================================================================

M	source/blender/blenkernel/intern/subsurf_ccg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index ce9fdec..5eb60a9 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2820,13 +2820,13 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm,
 		int matnr = -1;
 		int do_draw = 0;
 
-#define PASSATTRIB(dx, dy, vert) {                                                  \
-	if (attribs.totorco)                                                        \
-		index = getFaceIndex(ss, f, S, x + dx, y + dy, edgeSize, gridSize); \
-	else                                                                        \
-		index = 0;                                                          \
-	DM_draw_attrib_vertex(&attribs, a, index, vert, ((a) * 4) + vert);          \
-	DM_draw_attrib_vertex_uniforms(&attribs);                                   \
+#define PASSATTRIB(dx, dy, vert) {                                           \
+    if (attribs.totorco)                                                     \
+        index = getFaceIndex(ss, f, S, x + dx, y + dy, edgeSize, gridSize);  \
+    else                                                                     \
+        index = 0;                                                           \
+    DM_draw_attrib_vertex(&attribs, a, index, vert, ((a) * 4) + vert);       \
+    DM_draw_attrib_vertex_uniforms(&attribs);                                \
 } (void)0
 
 		totpoly = ccgSubSurf_getNumFaces(ss);
@@ -3223,13 +3223,13 @@ static void ccgDM_drawMappedFacesMat(DerivedMesh *dm,
 
 	matnr = -1;
 
-#define PASSATTRIB(dx, dy, vert) {                                                   \
-	if (attribs.totorco)                                                         \
-		index = getFaceIndex(ss, f, S, x + dx, y + dy, edgeSize, gridSize);  \
-	else                                                                         \
-		index = 0;                                                           \
-	DM_draw_attrib_vertex(&attribs, a, index, vert, ((a) * 4) + vert);           \
-	DM_draw_attrib_vertex_uniforms(&attribs);                                    \
+#define PASSATTRIB(dx, dy, vert) {                                           \
+    if (attribs.totorco)                                                     \
+        index = getFaceIndex(ss, f, S, x + dx, y + dy, edgeSize, gridSize);  \
+    else                                                                     \
+        index = 0;                                                           \
+    DM_draw_attrib_vertex(&attribs, a, index, vert, ((a) * 4) + vert);       \
+    DM_draw_attrib_vertex_uniforms(&attribs);                                \
 } (void)0
 
 	totface = ccgSubSurf_getNumFaces(ss);




More information about the Bf-blender-cvs mailing list