Cleanup: style, use braces in source/ (include disabled blocks)

7 files changed, 50 insertions, 25 deletions

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 667219e0eec..eb1e8311a12 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -1173,8 +1173,9 @@ void CDDM_calc_normals(DerivedMesh *dm)
   CDDerivedMesh *cddm = (CDDerivedMesh *)dm;
   float(*poly_nors)[3];
 
-  if (dm->numVertData == 0)
+  if (dm->numVertData == 0) {
     return;
+  }
 
   /* we don't want to overwrite any referenced layers */
   cddm->mvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index fcc0e1856af..dc238641a86 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -1732,8 +1732,9 @@ static int cloth_build_springs(ClothModifierData *clmd, Mesh *mesh)
   cloth_free_edgelist(edgelist, mvert_num);
 
 #if 0
-  if (G.debug_value > 0)
+  if (G.debug_value > 0) {
     printf("avg_len: %f\n", clmd->sim_parms->avg_spring_len);
+  }
 #endif
 
   return 1;
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index b5242d00ee0..8c6fbe98000 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -3081,8 +3081,9 @@ int dynamicPaint_createUVSurface(Scene *scene,
         for (int ty = 0; ty < h; ty++) {
           for (int tx = 0; tx < w; tx++) {
             const int index = tx + w * ty;
-            if (tempPoints[index].tri_index != -1)
+            if (tempPoints[index].tri_index != -1) {
               tmp[final_index[index]] = index;
+            }
           }
         }
         for (int ty = 0; ty < h; ty++) {
@@ -3193,8 +3194,9 @@ int dynamicPaint_createUVSurface(Scene *scene,
       pPoint->alpha = 1.0f;
 
       /* Every pixel that is assigned as "edge pixel" gets blue color */
-      if (uvPoint->neighbour_pixel != -1)
+      if (uvPoint->neighbour_pixel != -1) {
         pPoint->color[2] = 1.0f;
+      }
       /* and every pixel that finally got an polygon gets red color */
       /* green color shows pixel face index hash */
       if (uvPoint->tri_index != -1) {
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 70a8f4f124c..3f8fc697c6c 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -965,10 +965,12 @@ static bool vfont_to_curve(Object *ob,
 
       /* XXX, has been unused for years, need to check if this is useful, r4613 r5282 - campbell */
 #if 0
-      if (ascii == '\n')
+      if (ascii == '\n') {
         xof = xof_scale;
-      else
+      }
+      else {
         xof = MARGIN_X_MIN;
+      }
 #else
       xof = MARGIN_X_MIN;
 #endif
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 63ef1458de8..34b1f2e1837 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -239,28 +239,34 @@ static const char *ob_adrcodes_to_paths(int adrcode, int *array_index)
       return "color";
 #if 0
     case OB_PD_FSTR:
-      if (ob->pd)
+      if (ob->pd) {
         poin = &(ob->pd->f_strength);
+      }
       break;
     case OB_PD_FFALL:
-      if (ob->pd)
+      if (ob->pd) {
         poin = &(ob->pd->f_power);
+      }
       break;
     case OB_PD_SDAMP:
-      if (ob->pd)
+      if (ob->pd) {
         poin = &(ob->pd->pdef_damp);
+      }
       break;
     case OB_PD_RDAMP:
-      if (ob->pd)
+      if (ob->pd) {
         poin = &(ob->pd->pdef_rdamp);
+      }
       break;
     case OB_PD_PERM:
-      if (ob->pd)
+      if (ob->pd) {
         poin = &(ob->pd->pdef_perm);
+      }
       break;
     case OB_PD_FMAXD:
-      if (ob->pd)
+      if (ob->pd) {
         poin = &(ob->pd->maxdist);
+      }
       break;
 #endif
   }
@@ -688,10 +694,12 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index)
     case CAM_LENS:
 #if 0   /* XXX this cannot be resolved easily... \
          * perhaps we assume camera is perspective (works for most cases... */
-      if (ca->type == CAM_ORTHO)
+      if (ca->type == CAM_ORTHO) {
         return "ortho_scale";
-      else
+      }
+      else {
         return "lens";
+      }
 #else   // XXX lazy hack for now...
       return "lens";
 #endif  // XXX this cannot be resolved easily
@@ -884,28 +892,34 @@ static const char *particle_adrcodes_to_paths(int adrcode, int *array_index)
        * as the similar object forces */
 #if 0
     case PART_PD_FSTR:
-      if (part->pd)
+      if (part->pd) {
         poin = &(part->pd->f_strength);
+      }
       break;
     case PART_PD_FFALL:
-      if (part->pd)
+      if (part->pd) {
         poin = &(part->pd->f_power);
+      }
       break;
     case PART_PD_FMAXD:
-      if (part->pd)
+      if (part->pd) {
         poin = &(part->pd->maxdist);
+      }
       break;
     case PART_PD2_FSTR:
-      if (part->pd2)
+      if (part->pd2) {
         poin = &(part->pd2->f_strength);
+      }
       break;
     case PART_PD2_FFALL:
-      if (part->pd2)
+      if (part->pd2) {
         poin = &(part->pd2->f_power);
+      }
       break;
     case PART_PD2_FMAXD:
-      if (part->pd2)
+      if (part->pd2) {
         poin = &(part->pd2->maxdist);
+      }
       break;
 #endif
   }
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 27203158a4f..7ea77ec2849 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1729,8 +1729,9 @@ bool BKE_id_new_name_validate(ListBase *lb, ID *id, const char *tname)
    * sorting should not hurt, but noting just incase it alters the way other
    * functions work, so sort every time */
 #if 0
-  if (result)
+  if (result) {
     id_sort_by_name(lb, id);
+  }
 #endif
 
   id_sort_by_name(lb, id);
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 2a3145bee6c..55236bfefd0 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1860,15 +1860,17 @@ static void dfdx_spring(int ia, int ic, int op, float dir[3], float L, float len
 static void dfdx_goal(int ia, int ic, int op, float factor)
 {
   int i;
-  for (i = 0; i < 3; i++)
+  for (i = 0; i < 3; i++) {
     EIG_linear_solver_matrix_add(ia + i, op + ic + i, factor);
+  }
 }
 
 static void dfdv_goal(int ia, int ic, float factor)
 {
   int i;
-  for (i = 0; i < 3; i++)
+  for (i = 0; i < 3; i++) {
     EIG_linear_solver_matrix_add(ia + i, ic + i, factor);
+  }
 }
 #endif /* if 0 */
 
@@ -2336,10 +2338,12 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float *
   /* old one with homogeneous masses  */
   /* claim a minimum mass for vertex */
 #if 0
-  if (sb->nodemass > 0.009999f)
+  if (sb->nodemass > 0.009999f) {
     timeovermass = forcetime / sb->nodemass;
-  else
+  }
+  else {
     timeovermass = forcetime / 0.009999f;
+  }
 #endif
 
   for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) {