Cleanup: use parenthesis for if statements in macros

6 files changed, 42 insertions, 22 deletions

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index c3d107105a9..cd213b49c5b 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -390,8 +390,9 @@ void pbvh_vertex_iter_init(PBVH *pbvh, PBVHNode *node, PBVHVertexIter *vi, int m
       vi.height = vi.gridsize; \
       vi.index = vi.grid_indices[vi.g] * vi.key.grid_area - 1; \
       vi.grid = vi.grids[vi.grid_indices[vi.g]]; \
-      if (mode == PBVH_ITER_UNIQUE) \
+      if (mode == PBVH_ITER_UNIQUE) { \
         vi.gh = vi.grid_hidden[vi.grid_indices[vi.g]]; \
+      } \
     } \
     else { \
       vi.width = vi.totvert; \
@@ -408,8 +409,9 @@ void pbvh_vertex_iter_init(PBVH *pbvh, PBVHNode *node, PBVHVertexIter *vi, int m
           vi.index++; \
           vi.visible = true; \
           if (vi.gh) { \
-            if (BLI_BITMAP_TEST(vi.gh, vi.gy * vi.gridsize + vi.gx)) \
+            if (BLI_BITMAP_TEST(vi.gh, vi.gy * vi.gridsize + vi.gx)) { \
               continue; \
+            } \
           } \
         } \
         else if (vi.mverts) { \
@@ -426,10 +428,12 @@ void pbvh_vertex_iter_init(PBVH *pbvh, PBVHNode *node, PBVHVertexIter *vi, int m
           vi.co = vi.mvert->co; \
           vi.no = vi.mvert->no; \
           vi.index = vi.vert_indices[vi.i]; \
-          if (vi.vmask) \
+          if (vi.vmask) { \
             vi.mask = &vi.vmask[vi.index]; \
-          if (vi.vcol) \
+          } \
+          if (vi.vcol) { \
             vi.col = vi.vcol[vi.index].color; \
+          } \
         } \
         else { \
           if (!BLI_gsetIterator_done(&vi.bm_unique_verts)) { \
@@ -441,8 +445,9 @@ void pbvh_vertex_iter_init(PBVH *pbvh, PBVHNode *node, PBVHVertexIter *vi, int m
             BLI_gsetIterator_step(&vi.bm_other_verts); \
           } \
           vi.visible = !BM_elem_flag_test_bool(vi.bm_vert, BM_ELEM_HIDDEN); \
-          if (mode == PBVH_ITER_UNIQUE && !vi.visible) \
+          if (mode == PBVH_ITER_UNIQUE && !vi.visible) { \
             continue; \
+          } \
           vi.co = vi.bm_vert->co; \
           vi.fno = vi.bm_vert->no; \
           vi.index = BM_elem_index_get(vi.bm_vert); \
diff --git a/source/blender/blenkernel/intern/anim_data.c b/source/blender/blenkernel/intern/anim_data.c
index 5ce449c5000..6f36b6ee99b 100644
--- a/source/blender/blenkernel/intern/anim_data.c
+++ b/source/blender/blenkernel/intern/anim_data.c
@@ -1287,8 +1287,9 @@ void BKE_animdata_main_cb(Main *bmain, ID_AnimData_Edit_Callback func, void *use
 #define ANIMDATA_IDS_CB(first) \
   for (id = first; id; id = id->next) { \
     AnimData *adt = BKE_animdata_from_id(id); \
-    if (adt) \
+    if (adt) { \
       func(id, adt, user_data); \
+    } \
   } \
   (void)0
 
@@ -1299,11 +1300,13 @@ void BKE_animdata_main_cb(Main *bmain, ID_AnimData_Edit_Callback func, void *use
     NtId_Type *ntp = (NtId_Type *)id; \
     if (ntp->nodetree) { \
       AnimData *adt2 = BKE_animdata_from_id((ID *)ntp->nodetree); \
-      if (adt2) \
+      if (adt2) { \
         func(id, adt2, user_data); \
+      } \
     } \
-    if (adt) \
+    if (adt) { \
       func(id, adt, user_data); \
+    } \
   } \
   (void)0
 
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index a816e4354b8..7eea911f515 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -1545,20 +1545,28 @@ void BKE_brush_debug_print_state(Brush *br)
   brush_defaults(&def);
 
 #define BR_TEST(field, t) \
-  if (br->field != def.field) \
-  printf("br->" #field " = %" #t ";\n", br->field)
+  if (br->field != def.field) { \
+    printf("br->" #field " = %" #t ";\n", br->field); \
+  } \
+  ((void)0)
 
 #define BR_TEST_FLAG(_f) \
-  if ((br->flag & _f) && !(def.flag & _f)) \
+  if ((br->flag & _f) && !(def.flag & _f)) { \
     printf("br->flag |= " #_f ";\n"); \
-  else if (!(br->flag & _f) && (def.flag & _f)) \
-  printf("br->flag &= ~" #_f ";\n")
+  } \
+  else if (!(br->flag & _f) && (def.flag & _f)) { \
+    printf("br->flag &= ~" #_f ";\n"); \
+  } \
+  ((void)0)
 
 #define BR_TEST_FLAG_OVERLAY(_f) \
-  if ((br->overlay_flags & _f) && !(def.overlay_flags & _f)) \
+  if ((br->overlay_flags & _f) && !(def.overlay_flags & _f)) { \
     printf("br->overlay_flags |= " #_f ";\n"); \
-  else if (!(br->overlay_flags & _f) && (def.overlay_flags & _f)) \
-  printf("br->overlay_flags &= ~" #_f ";\n")
+  } \
+  else if (!(br->overlay_flags & _f) && (def.overlay_flags & _f)) { \
+    printf("br->overlay_flags &= ~" #_f ";\n"); \
+  } \
+  ((void)0)
 
   /* print out any non-default brush state */
   BR_TEST(normal_weight, f);
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 9411f937f08..601704fc8c5 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -788,9 +788,9 @@ static void default_get_tarmat_full_bbone(struct Depsgraph *UNUSED(depsgraph),
     ct->space = con->tarspace; \
     ct->flag = CONSTRAINT_TAR_TEMP; \
 \
-    if (ct->tar) \
+    if (ct->tar) { \
       ct->type = CONSTRAINT_OBTYPE_OBJECT; \
-\
+    } \
     BLI_addtail(list, ct); \
   } \
   (void)0
@@ -2645,7 +2645,8 @@ static void actcon_get_tarmat(struct Depsgraph *depsgraph,
     /* Skip targets if we're using local float property to set action time */
     if (data->flag & ACTCON_USE_EVAL_TIME) {
       s = data->eval_time;
-    } else {
+    }
+    else {
       /* get the transform matrix of the target */
       constraint_target_to_mat4(ct->tar,
                                 ct->subtarget,
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index 338420641cf..990d99e5ec4 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -198,8 +198,10 @@ static int search_polyloop_cmp(const void *v1, const void *v2)
  * \{ */
 
 #define PRINT_MSG(...) \
-  if (do_verbose) \
-  CLOG_INFO(&LOG, 1, __VA_ARGS__)
+  if (do_verbose) { \
+    CLOG_INFO(&LOG, 1, __VA_ARGS__); \
+  } \
+  ((void)0)
 
 #define PRINT_ERR(...) \
   do { \
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index e837c57400a..0fa665a3424 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3997,8 +3997,9 @@ static int get_particle_uv(Mesh *mesh,
 
 #define CLAMP_WARP_PARTICLE_TEXTURE_POS(type, pvalue) \
   if (event & type) { \
-    if (pvalue < 0.0f) \
+    if (pvalue < 0.0f) { \
       pvalue = 1.0f + pvalue; \
+    } \
     CLAMP(pvalue, 0.0f, 1.0f); \
   } \
   (void)0