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

6 files changed, 144 insertions, 72 deletions

diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 334959a7523..bc404110008 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -605,8 +605,9 @@ static void cloth_calc_force(
             BPH_mass_spring_force_edge_wind(
                 data, spring->ij, spring->kl, hair_ij->radius, hair_kl->radius, winvec);
           }
-          else
+          else {
             BPH_mass_spring_force_edge_wind(data, spring->ij, spring->kl, 1.0f, 1.0f, winvec);
+          }
         }
       }
 #else
@@ -961,8 +962,9 @@ static void cloth_calc_volume_force(ClothModifierData *clmd)
     for (i = 0; i < mvert_num; i++, vert++) {
       float x[3], v[3], f[3], dfdx[3][3], dfdv[3][3];
 
-      if (vert->solver_index < 0)
+      if (vert->solver_index < 0) {
         continue;
+      }
 
       /* calculate volumetric forces */
       BPH_mass_spring_get_motion_state(data, vert->solver_index, x, v);
diff --git a/source/blender/physics/intern/ConstrainedConjugateGradient.h b/source/blender/physics/intern/ConstrainedConjugateGradient.h
index 4a0a6ab298c..56151b714a6 100644
--- a/source/blender/physics/intern/ConstrainedConjugateGradient.h
+++ b/source/blender/physics/intern/ConstrainedConjugateGradient.h
@@ -94,8 +94,9 @@ EIGEN_DONT_INLINE void constrained_conjugate_gradient(const MatrixType &mat,
     residual -= alpha * tmp;             // update residue
 
     residualNorm2 = residual.squaredNorm();
-    if (residualNorm2 < threshold)
+    if (residualNorm2 < threshold) {
       break;
+    }
 
     z = precond.solve(residual);  // approximately solve for "A z = residual"
 
diff --git a/source/blender/physics/intern/eigen_utils.h b/source/blender/physics/intern/eigen_utils.h
index 361ebadf5d2..273b13e096a 100644
--- a/source/blender/physics/intern/eigen_utils.h
+++ b/source/blender/physics/intern/eigen_utils.h
@@ -54,14 +54,16 @@ class Vector3 : public Eigen::Vector3f {
 
   Vector3(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
+    for (int k = 0; k < 3; ++k) {
       coeffRef(k) = v[k];
+    }
   }
 
   Vector3 &operator=(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
+    for (int k = 0; k < 3; ++k) {
       coeffRef(k) = v[k];
+    }
     return *this;
   }
 
@@ -84,16 +86,20 @@ class Matrix3 : public Eigen::Matrix3f {
 
   Matrix3(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         coeffRef(l, k) = v[k][l];
+      }
+    }
   }
 
   Matrix3 &operator=(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         coeffRef(l, k) = v[k][l];
+      }
+    }
     return *this;
   }
 
@@ -164,18 +170,22 @@ struct lMatrix3fCtor {
   {
     i *= 3;
     j *= 3;
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         m_trips.push_back(Triplet(i + k, j + l, m.coeff(l, k)));
+      }
+    }
   }
 
   void sub(int i, int j, const Matrix3 &m)
   {
     i *= 3;
     j *= 3;
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         m_trips.push_back(Triplet(i + k, j + l, -m.coeff(l, k)));
+      }
+    }
   }
 
   inline void construct(lMatrix &m)
@@ -196,8 +206,9 @@ using Eigen::ComputationInfo;
 BLI_INLINE void print_lvector(const lVector3f &v)
 {
   for (int i = 0; i < v.rows(); ++i) {
-    if (i > 0 && i % 3 == 0)
+    if (i > 0 && i % 3 == 0) {
       printf("\n");
+    }
 
     printf("%f,\n", v[i]);
   }
@@ -206,12 +217,14 @@ BLI_INLINE void print_lvector(const lVector3f &v)
 BLI_INLINE void print_lmatrix(const lMatrix &m)
 {
   for (int j = 0; j < m.rows(); ++j) {
-    if (j > 0 && j % 3 == 0)
+    if (j > 0 && j % 3 == 0) {
       printf("\n");
+    }
 
     for (int i = 0; i < m.cols(); ++i) {
-      if (i > 0 && i % 3 == 0)
+      if (i > 0 && i % 3 == 0) {
         printf("  ");
+      }
 
       implicit_print_matrix_elem(m.coeff(j, i));
     }
diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/physics/intern/hair_volume.cpp
index 1123924078c..a4f799974e3 100644
--- a/source/blender/physics/intern/hair_volume.cpp
+++ b/source/blender/physics/intern/hair_volume.cpp
@@ -481,8 +481,9 @@ BLI_INLINE void hair_volume_add_segment_2D(HairGrid *grid,
         grid_to_world(grid, x2w, x2);
         grid_to_world(grid, x3w, x3);
 
-        if (vert_k->samples > 0)
+        if (vert_k->samples > 0) {
           BKE_sim_debug_data_add_circle(wloc, 0.01f, 1.0, 1.0, 0.3, "grid", 2525, debug_i, j, k);
+        }
 
         if (grid->debug_value) {
           BKE_sim_debug_data_add_dot(wloc, 1, 0, 0, "grid", 93, debug_i, j, k);
@@ -830,9 +831,10 @@ bool BPH_hair_volume_solve_divergence(HairGrid *grid,
             fac = CLAMPIS(-divergence * target_strength, 0.0, 1.0);
             interp_v3_v3v3(col, col0, coln, fac);
           }
-          if (fac > 0.05f)
+          if (fac > 0.05f) {
             BKE_sim_debug_data_add_circle(
                 grid->debug_data, wloc, 0.01f, col[0], col[1], col[2], "grid", 5522, i, j, k);
+          }
         }
 #endif
       }
@@ -969,8 +971,9 @@ bool BPH_hair_volume_solve_divergence(HairGrid *grid,
             int u = i * strideA0 + j * strideA1 + k * strideA2;
             bool is_margin = MARGIN_i0 || MARGIN_i1 || MARGIN_j0 || MARGIN_j1 || MARGIN_k0 ||
                              MARGIN_k1;
-            if (i != slice)
+            if (i != slice) {
               continue;
+            }
 
             vert = vert_start + i * stride0 + j * stride1 + k * stride2;
 
@@ -995,9 +998,10 @@ bool BPH_hair_volume_solve_divergence(HairGrid *grid,
               fac = CLAMPIS(-pressure * grid->debug1, 0.0, 1.0);
               interp_v3_v3v3(col, col0, coln, fac);
             }
-            if (fac > 0.05f)
+            if (fac > 0.05f) {
               BKE_sim_debug_data_add_circle(
                   grid->debug_data, wloc, 0.01f, col[0], col[1], col[2], "grid", 5533, i, j, k);
+            }
 
             if (!is_margin) {
               float dvel[3];
@@ -1084,8 +1088,9 @@ void BPH_hair_volume_vertex_grid_filter_box(HairVertexGrid *grid, int kernel_siz
   float invD;
   int i, j, k;
 
-  if (kernel_size <= 0)
+  if (kernel_size <= 0) {
     return;
+  }
 
   tot = kernel_size * 2 + 1;
   invD = 1.0f / (float)(tot * tot * tot);
@@ -1234,8 +1239,9 @@ static HairGridVert *hair_volume_create_collision_grid(ClothModifierData *clmd,
       for (v = 0; v < col->collmd->numverts; v++, loc0++, loc1++) {
         int offset;
 
-        if (!hair_grid_point_valid(loc1->co, gmin, gmax))
+        if (!hair_grid_point_valid(loc1->co, gmin, gmax)) {
           continue;
+        }
 
         offset = hair_grid_weights(res, gmin, scale, lX[v], weights);
 
@@ -1260,8 +1266,9 @@ static HairGridVert *hair_volume_create_collision_grid(ClothModifierData *clmd,
   /* divide velocity with density */
   for (i = 0; i < size; i++) {
     float density = collgrid[i].density;
-    if (density > 0.0f)
+    if (density > 0.0f) {
       mul_v3_fl(collgrid[i].velocity, 1.0f / density);
+    }
   }
 
   return collgrid;
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index 9952781b60f..93df51ce58d 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -301,8 +301,9 @@ static void print_lvector(lfVector *v, int numverts)
 {
   int i;
   for (i = 0; i < numverts; ++i) {
-    if (i > 0)
+    if (i > 0) {
       printf("\n");
+    }
 
     printf("%f,\n", v[i][0]);
     printf("%f,\n", v[i][1]);
@@ -340,12 +341,14 @@ static void print_bfmatrix(fmatrix3x3 *m)
   }
 
   for (j = 0; j < size; ++j) {
-    if (j > 0 && j % 3 == 0)
+    if (j > 0 && j % 3 == 0) {
       printf("\n");
+    }
 
     for (i = 0; i < size; ++i) {
-      if (i > 0 && i % 3 == 0)
+      if (i > 0 && i % 3 == 0) {
         printf("  ");
+      }
 
       implicit_print_matrix_elem(t[i + j * size]);
     }
diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp
index 04ca24e0382..277b62fba7c 100644
--- a/source/blender/physics/intern/implicit_eigen.cpp
+++ b/source/blender/physics/intern/implicit_eigen.cpp
@@ -98,14 +98,16 @@ class fVector : public Eigen::Vector3f {
 
   fVector(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
+    for (int k = 0; k < 3; ++k) {
       coeffRef(k) = v[k];
+    }
   }
 
   fVector &operator=(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
+    for (int k = 0; k < 3; ++k) {
       coeffRef(k) = v[k];
+    }
     return *this;
   }
 
@@ -128,16 +130,20 @@ class fMatrix : public Eigen::Matrix3f {
 
   fMatrix(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         coeffRef(l, k) = v[k][l];
+      }
+    }
   }
 
   fMatrix &operator=(const ctype &v)
   {
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         coeffRef(l, k) = v[k][l];
+      }
+    }
     return *this;
   }
 
@@ -206,18 +212,22 @@ struct lMatrixCtor {
   {
     i *= 3;
     j *= 3;
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         m_trips.push_back(Triplet(i + k, j + l, m.coeff(l, k)));
+      }
+    }
   }
 
   void sub(int i, int j, const fMatrix &m)
   {
     i *= 3;
     j *= 3;
-    for (int k = 0; k < 3; ++k)
-      for (int l = 0; l < 3; ++l)
+    for (int k = 0; k < 3; ++k) {
+      for (int l = 0; l < 3; ++l) {
         m_trips.push_back(Triplet(i + k, j + l, -m.coeff(l, k)));
+      }
+    }
   }
 
   inline void construct(lMatrix &m)
@@ -246,8 +256,9 @@ using Eigen::ComputationInfo;
 static void print_lvector(const lVector &v)
 {
   for (int i = 0; i < v.rows(); ++i) {
-    if (i > 0 && i % 3 == 0)
+    if (i > 0 && i % 3 == 0) {
       printf("\n");
+    }
 
     printf("%f,\n", v[i]);
   }
@@ -256,12 +267,14 @@ static void print_lvector(const lVector &v)
 static void print_lmatrix(const lMatrix &m)
 {
   for (int j = 0; j < m.rows(); ++j) {
-    if (j > 0 && j % 3 == 0)
+    if (j > 0 && j % 3 == 0) {
       printf("\n");
+    }
 
     for (int i = 0; i < m.cols(); ++i) {
-      if (i > 0 && i % 3 == 0)
+      if (i > 0 && i % 3 == 0) {
         printf("  ");
+      }
 
       implicit_print_matrix_elem(m.coeff(j, i));
     }
@@ -455,16 +468,19 @@ Implicit_Data *BPH_mass_spring_solver_create(int numverts, int numsprings)
 
 void BPH_mass_spring_solver_free(Implicit_Data *id)
 {
-  if (id)
+  if (id) {
     delete id;
+  }
 }
 
 int BPH_mass_spring_solver_numvert(Implicit_Data *id)
 {
-  if (id)
+  if (id) {
     return id->numverts;
-  else
+  }
+  else {
     return 0;
+  }
 }
 
 /* ==== Transformation from/to root reference frames ==== */
@@ -625,10 +641,12 @@ void BPH_mass_spring_get_motion_state(struct Implicit_Data *data,
                                       float x[3],
                                       float v[3])
 {
-  if (x)
+  if (x) {
     root_to_world_v3(data, index, x, data->X.v3(index));
-  if (v)
+  }
+  if (v) {
     root_to_world_v3(data, index, v, data->V.v3(index));
+  }
 }
 
 void BPH_mass_spring_get_position(struct Implicit_Data *data, int index, float x[3])
@@ -910,10 +928,12 @@ BLI_INLINE float fbstar(float length, float L, float kb, float cb)
   float tempfb_fl = kb * fb(length, L);
   float fbstar_fl = cb * (length - L);
 
-  if (tempfb_fl < fbstar_fl)
+  if (tempfb_fl < fbstar_fl) {
     return fbstar_fl;
-  else
+  }
+  else {
     return tempfb_fl;
+  }
 }
 
 // function to calculae bending spring force (taken from Choi & Co)
@@ -1015,22 +1035,28 @@ bool BPH_mass_spring_force_spring_linear(Implicit_Data *data,
 
     apply_spring(data, i, j, f, dfdx, dfdv);
 
-    if (r_f)
+    if (r_f) {
       copy_v3_v3(r_f, f);
-    if (r_dfdx)
+    }
+    if (r_dfdx) {
       copy_m3_m3(r_dfdx, dfdx);
-    if (r_dfdv)
+    }
+    if (r_dfdv) {
       copy_m3_m3(r_dfdv, dfdv);
+    }
 
     return true;
   }
   else {
-    if (r_f)
+    if (r_f) {
       zero_v3(r_f);
-    if (r_dfdx)
+    }
+    if (r_dfdx) {
       zero_m3(r_dfdx);
-    if (r_dfdv)
+    }
+    if (r_dfdv) {
       zero_m3(r_dfdv);
+    }
 
     return false;
   }
@@ -1065,22 +1091,28 @@ bool BPH_mass_spring_force_spring_bending(Implicit_Data *data,
 
     apply_spring(data, i, j, f, dfdx, dfdv);
 
-    if (r_f)
+    if (r_f) {
       copy_v3_v3(r_f, f);
-    if (r_dfdx)
+    }
+    if (r_dfdx) {
       copy_m3_m3(r_dfdx, dfdx);
-    if (r_dfdv)
+    }
+    if (r_dfdv) {
       copy_m3_m3(r_dfdv, dfdv);
+    }
 
     return true;
   }
   else {
-    if (r_f)
+    if (r_f) {
       zero_v3(r_f);
-    if (r_dfdx)
+    }
+    if (r_dfdx) {
       zero_m3(r_dfdx);
-    if (r_dfdv)
+    }
+    if (r_dfdv) {
       zero_m3(r_dfdv);
+    }
 
     return false;
   }
@@ -1132,30 +1164,38 @@ BLI_INLINE void spring_angbend_forces(Implicit_Data *data,
   zero_v3(fk);
 
   sub_v3_v3v3(edge_ij, data->X.v3(j), data->X.v3(i));
-  if (q == i)
+  if (q == i) {
     sub_v3_v3(edge_ij, dx);
-  if (q == j)
+  }
+  if (q == j) {
     add_v3_v3(edge_ij, dx);
+  }
   normalize_v3_v3(dir_ij, edge_ij);
 
   sub_v3_v3v3(edge_jk, data->X.v3(k), data->X.v3(j));
-  if (q == j)
+  if (q == j) {
     sub_v3_v3(edge_jk, dx);
-  if (q == k)
+  }
+  if (q == k) {
     add_v3_v3(edge_jk, dx);
+  }
   normalize_v3_v3(dir_jk, edge_jk);
 
   sub_v3_v3v3(vel_ij, data->V.v3(j), data->V.v3(i));
-  if (q == i)
+  if (q == i) {
     sub_v3_v3(vel_ij, dv);
-  if (q == j)
+  }
+  if (q == j) {
     add_v3_v3(vel_ij, dv);
+  }
 
   sub_v3_v3v3(vel_jk, data->V.v3(k), data->V.v3(j));
-  if (q == j)
+  if (q == j) {
     sub_v3_v3(vel_jk, dv);
-  if (q == k)
+  }
+  if (q == k) {
     add_v3_v3(vel_jk, dv);
+  }
 
   /* bending force */
   sub_v3_v3v3(dist, goal, edge_jk);
@@ -1439,22 +1479,28 @@ bool BPH_mass_spring_force_spring_goal(Implicit_Data *data,
     data->idFdX.add(i, i, dfdx);
     data->idFdV.add(i, i, dfdv);
 
-    if (r_f)
+    if (r_f) {
       copy_v3_v3(r_f, f);
-    if (r_dfdx)
+    }
+    if (r_dfdx) {
       copy_m3_m3(r_dfdx, dfdx);
-    if (r_dfdv)
+    }
+    if (r_dfdv) {
       copy_m3_m3(r_dfdv, dfdv);
+    }
 
     return true;
   }
   else {
-    if (r_f)
+    if (r_f) {
       zero_v3(r_f);
-    if (r_dfdx)
+    }
+    if (r_dfdx) {
       zero_m3(r_dfdx);
-    if (r_dfdv)
+    }
+    if (r_dfdv) {
       zero_m3(r_dfdv);
+    }
 
     return false;
   }