Cleanup: clang-format

10 files changed, 97 insertions, 76 deletions

diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index cff081dd04a..1a8e90ac30c 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -267,7 +267,7 @@ void BKE_gpencil_modifier_free(struct GpencilModifierData *md);
 bool BKE_gpencil_modifier_unique_name(struct ListBase *modifiers, struct GpencilModifierData *gmd);
 bool BKE_gpencil_modifier_depends_ontime(struct GpencilModifierData *md);
 struct GpencilModifierData *BKE_gpencil_modifiers_findby_type(struct Object *ob,
-                                                             GpencilModifierType type);
+                                                              GpencilModifierType type);
 struct GpencilModifierData *BKE_gpencil_modifiers_findny_name(struct Object *ob, const char *name);
 void BKE_gpencil_modifier_copydata_generic(const struct GpencilModifierData *md_src,
                                            struct GpencilModifierData *md_dst);
@@ -277,11 +277,11 @@ void BKE_gpencil_modifier_copydata_ex(struct GpencilModifierData *md,
                                       struct GpencilModifierData *target,
                                       const int flag);
 void BKE_gpencil_modifiers_foreach_ID_link(struct Object *ob,
-                                         GreasePencilIDWalkFunc walk,
-                                         void *userData);
+                                           GreasePencilIDWalkFunc walk,
+                                           void *userData);
 void BKE_gpencil_modifiers_foreach_tex_link(struct Object *ob,
-                                          GreasePencilTexWalkFunc walk,
-                                          void *userData);
+                                            GreasePencilTexWalkFunc walk,
+                                            void *userData);
 
 bool BKE_gpencil_has_geometry_modifiers(struct Object *ob);
 bool BKE_gpencil_has_time_modifiers(struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 1295f331461..a4bf86f61f3 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -365,10 +365,12 @@ void BKE_modifier_free(struct ModifierData *md);
 bool BKE_modifier_unique_name(struct ListBase *modifiers, struct ModifierData *md);
 
 void BKE_modifier_copydata_generic(const struct ModifierData *md,
-                               struct ModifierData *target,
-                               const int flag);
+                                   struct ModifierData *target,
+                                   const int flag);
 void BKE_modifier_copydata(struct ModifierData *md, struct ModifierData *target);
-void BKE_modifier_copydata_ex(struct ModifierData *md, struct ModifierData *target, const int flag);
+void BKE_modifier_copydata_ex(struct ModifierData *md,
+                              struct ModifierData *target,
+                              const int flag);
 bool BKE_modifier_depends_ontime(struct ModifierData *md);
 bool BKE_modifier_supports_mapping(struct ModifierData *md);
 bool BKE_modifier_supports_cage(struct Scene *scene, struct ModifierData *md);
@@ -376,8 +378,11 @@ bool BKE_modifier_couldbe_cage(struct Scene *scene, struct ModifierData *md);
 bool BKE_modifier_is_correctable_deformed(struct ModifierData *md);
 bool BKE_modifier_is_same_topology(ModifierData *md);
 bool BKE_modifier_is_non_geometrical(ModifierData *md);
-bool BKE_modifier_is_enabled(const struct Scene *scene, struct ModifierData *md, int required_mode);
-void BKE_modifier_set_error(struct ModifierData *md, const char *format, ...) ATTR_PRINTF_FORMAT(2, 3);
+bool BKE_modifier_is_enabled(const struct Scene *scene,
+                             struct ModifierData *md,
+                             int required_mode);
+void BKE_modifier_set_error(struct ModifierData *md, const char *format, ...)
+    ATTR_PRINTF_FORMAT(2, 3);
 bool BKE_modifier_is_preview(struct ModifierData *md);
 
 void BKE_modifiers_foreach_object_link(struct Object *ob, ObjectWalkFunc walk, void *userData);
@@ -388,9 +393,9 @@ struct ModifierData *BKE_modifiers_findby_type(struct Object *ob, ModifierType t
 struct ModifierData *BKE_modifiers_findny_name(struct Object *ob, const char *name);
 void BKE_modifiers_clear_errors(struct Object *ob);
 int BKE_modifiers_get_cage_index(struct Scene *scene,
-                           struct Object *ob,
-                           int *r_lastPossibleCageIndex,
-                           bool is_virtual);
+                                 struct Object *ob,
+                                 int *r_lastPossibleCageIndex,
+                                 bool is_virtual);
 
 bool BKE_modifiers_is_modifier_enabled(struct Object *ob, int modifierType);
 bool BKE_modifiers_is_softbody_enabled(struct Object *ob);
@@ -418,15 +423,15 @@ typedef struct CDMaskLink {
  * final_datamask is required at the end of the stack.
  */
 struct CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
-                                           struct Object *ob,
-                                           struct ModifierData *md,
-                                           struct CustomData_MeshMasks *final_datamask,
-                                           int required_mode,
-                                           ModifierData *previewmd,
-                                           const struct CustomData_MeshMasks *previewmask);
+                                                struct Object *ob,
+                                                struct ModifierData *md,
+                                                struct CustomData_MeshMasks *final_datamask,
+                                                int required_mode,
+                                                ModifierData *previewmd,
+                                                const struct CustomData_MeshMasks *previewmask);
 struct ModifierData *BKE_modifier_get_last_preview(struct Scene *scene,
-                                              struct ModifierData *md,
-                                              int required_mode);
+                                                   struct ModifierData *md,
+                                                   int required_mode);
 
 typedef struct VirtualModifierData {
   ArmatureModifierData amd;
@@ -436,7 +441,7 @@ typedef struct VirtualModifierData {
 } VirtualModifierData;
 
 struct ModifierData *BKE_modifiers_get_virtual_modifierlist(const struct Object *ob,
-                                                      struct VirtualModifierData *data);
+                                                            struct VirtualModifierData *data);
 
 /* ensure modifier correctness when changing ob->data */
 void BKE_modifiers_test_object(struct Object *ob);
@@ -454,27 +459,27 @@ const char *BKE_modifier_path_relbase_from_global(struct Object *ob);
  * If the modifier data is already original, return it as-is. */
 struct ModifierData *BKE_modifier_get_original(struct ModifierData *md);
 struct ModifierData *BKE_modifier_get_evaluated(struct Depsgraph *depsgraph,
-                                            struct Object *object,
-                                            struct ModifierData *md);
+                                                struct Object *object,
+                                                struct ModifierData *md);
 
 /* wrappers for modifier callbacks that ensure valid normals */
 
 struct Mesh *BKE_modifier_modify_mesh(ModifierData *md,
-                                const struct ModifierEvalContext *ctx,
-                                struct Mesh *me);
+                                      const struct ModifierEvalContext *ctx,
+                                      struct Mesh *me);
 
 void BKE_modifier_deform_verts(ModifierData *md,
-                         const struct ModifierEvalContext *ctx,
-                         struct Mesh *me,
-                         float (*vertexCos)[3],
-                         int numVerts);
+                               const struct ModifierEvalContext *ctx,
+                               struct Mesh *me,
+                               float (*vertexCos)[3],
+                               int numVerts);
 
 void BKE_modifier_deform_vertsEM(ModifierData *md,
-                           const struct ModifierEvalContext *ctx,
-                           struct BMEditMesh *em,
-                           struct Mesh *me,
-                           float (*vertexCos)[3],
-                           int numVerts);
+                                 const struct ModifierEvalContext *ctx,
+                                 struct BMEditMesh *em,
+                                 struct Mesh *me,
+                                 float (*vertexCos)[3],
+                                 int numVerts);
 
 struct Mesh *BKE_modifier_get_evaluated_mesh_from_evaluated_object(struct Object *ob_eval,
                                                                    const bool get_cage_mesh);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 62a457ec442..b3893d8600f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -698,7 +698,8 @@ static float (*get_orco_coords(Object *ob, BMEditMesh *em, int layer, int *free)
     /* apply shape key for cloth, this should really be solved
      * by a more flexible customdata system, but not simple */
     if (!em) {
-      ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Cloth);
+      ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(
+          ob, eModifierType_Cloth);
       KeyBlock *kb = BKE_keyblock_from_key(BKE_key_from_object(ob),
                                            clmd->sim_parms->shapekey_rest);
 
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 05acb9a22f3..c13f9d5ef00 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -943,7 +943,8 @@ static void cloth_from_mesh(ClothModifierData *clmd, Mesh *mesh)
                                          "clothVertex");
   if (clmd->clothObject->verts == NULL) {
     cloth_free_modifier(clmd);
-    BKE_modifier_set_error(&(clmd->modifier), "Out of memory on allocating clmd->clothObject->verts");
+    BKE_modifier_set_error(&(clmd->modifier),
+                           "Out of memory on allocating clmd->clothObject->verts");
     printf("cloth_free_modifier clmd->clothObject->verts\n");
     return;
   }
@@ -959,7 +960,8 @@ static void cloth_from_mesh(ClothModifierData *clmd, Mesh *mesh)
   clmd->clothObject->tri = MEM_mallocN(sizeof(MVertTri) * looptri_num, "clothLoopTris");
   if (clmd->clothObject->tri == NULL) {
     cloth_free_modifier(clmd);
-    BKE_modifier_set_error(&(clmd->modifier), "Out of memory on allocating clmd->clothObject->looptri");
+    BKE_modifier_set_error(&(clmd->modifier),
+                           "Out of memory on allocating clmd->clothObject->looptri");
     printf("cloth_free_modifier clmd->clothObject->looptri\n");
     return;
   }
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 4240b49d9c3..6e4c343eac3 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -1142,7 +1142,7 @@ static void update_obstacleflags(FluidDomainSettings *mds,
   for (coll_index = 0; coll_index < coll_ob_array_len; coll_index++) {
     Object *coll_ob = coll_ob_array[coll_index];
     FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(coll_ob,
-                                                                        eModifierType_Fluid);
+                                                                             eModifierType_Fluid);
 
     /* Sanity check. */
     if (!mmd2) {
@@ -1215,7 +1215,7 @@ static void compute_obstaclesemission(Scene *scene,
   for (int effec_index = 0; effec_index < numeffecobjs; effec_index++) {
     Object *effecobj = effecobjs[effec_index];
     FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(effecobj,
-                                                                        eModifierType_Fluid);
+                                                                             eModifierType_Fluid);
 
     /* Sanity check. */
     if (!mmd2) {
@@ -1388,7 +1388,7 @@ static void update_obstacles(Depsgraph *depsgraph,
   for (int effec_index = 0; effec_index < numeffecobjs; effec_index++) {
     Object *effecobj = effecobjs[effec_index];
     FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(effecobj,
-                                                                        eModifierType_Fluid);
+                                                                             eModifierType_Fluid);
 
     /* Sanity check. */
     if (!mmd2) {
@@ -2628,7 +2628,7 @@ static void update_flowsflags(FluidDomainSettings *mds, Object **flowobjs, int n
   for (flow_index = 0; flow_index < numflowobj; flow_index++) {
     Object *flow_ob = flowobjs[flow_index];
     FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(flow_ob,
-                                                                        eModifierType_Fluid);
+                                                                             eModifierType_Fluid);
 
     /* Sanity check. */
     if (!mmd2) {
@@ -2759,7 +2759,7 @@ static void compute_flowsemission(Scene *scene,
   for (int flow_index = 0; flow_index < numflowobjs; flow_index++) {
     Object *flowobj = flowobjs[flow_index];
     FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(flowobj,
-                                                                        eModifierType_Fluid);
+                                                                             eModifierType_Fluid);
 
     /* Sanity check. */
     if (!mmd2) {
@@ -2979,7 +2979,7 @@ static void update_flowsfluids(struct Depsgraph *depsgraph,
   for (int flow_index = 0; flow_index < numflowobjs; flow_index++) {
     Object *flowobj = flowobjs[flow_index];
     FluidModifierData *mmd2 = (FluidModifierData *)BKE_modifiers_findby_type(flowobj,
-                                                                        eModifierType_Fluid);
+                                                                             eModifierType_Fluid);
 
     /* Sanity check. */
     if (!mmd2) {
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 90150747b9e..60df016acb9 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -605,7 +605,9 @@ void BKE_gpencil_modifiers_foreach_ID_link(Object *ob, GreasePencilIDWalkFunc wa
   }
 }
 
-void BKE_gpencil_modifiers_foreach_tex_link(Object *ob, GreasePencilTexWalkFunc walk, void *userData)
+void BKE_gpencil_modifiers_foreach_tex_link(Object *ob,
+                                            GreasePencilTexWalkFunc walk,
+                                            void *userData)
 {
   GpencilModifierData *md = ob->greasepencil_modifiers.first;
 
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index b3844d49cf6..dac23ac3d45 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -303,8 +303,8 @@ void BKE_modifiers_foreach_tex_link(Object *ob, TexWalkFunc walk, void *userData
  * to avoid copying every member.
  */
 void BKE_modifier_copydata_generic(const ModifierData *md_src,
-                               ModifierData *md_dst,
-                               const int UNUSED(flag))
+                                   ModifierData *md_dst,
+                                   const int UNUSED(flag))
 {
   const ModifierTypeInfo *mti = BKE_modifier_get_info(md_src->type);
 
@@ -374,7 +374,8 @@ bool BKE_modifier_couldbe_cage(struct Scene *scene, ModifierData *md)
   const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
 
   return ((md->mode & eModifierMode_Realtime) && (md->mode & eModifierMode_Editmode) &&
-          (!mti->isDisabled || !mti->isDisabled(scene, md, 0)) && BKE_modifier_supports_mapping(md));
+          (!mti->isDisabled || !mti->isDisabled(scene, md, 0)) &&
+          BKE_modifier_supports_mapping(md));
 }
 
 bool BKE_modifier_is_same_topology(ModifierData *md)
@@ -417,13 +418,14 @@ void BKE_modifier_set_error(ModifierData *md, const char *_format, ...)
  * also used for some mesh tools to give warnings
  */
 int BKE_modifiers_get_cage_index(struct Scene *scene,
-                           Object *ob,
-                           int *r_lastPossibleCageIndex,
-                           bool is_virtual)
+                                 Object *ob,
+                                 int *r_lastPossibleCageIndex,
+                                 bool is_virtual)
 {
   VirtualModifierData virtualModifierData;
-  ModifierData *md = (is_virtual) ? BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData) :
-                                    ob->modifiers.first;
+  ModifierData *md = (is_virtual) ?
+                         BKE_modifiers_get_virtual_modifierlist(ob, &virtualModifierData) :
+                         ob->modifiers.first;
   int i, cageIndex = -1;
 
   if (r_lastPossibleCageIndex) {
@@ -527,12 +529,12 @@ bool BKE_modifier_is_enabled(const struct Scene *scene, ModifierData *md, int re
 }
 
 CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
-                                    Object *ob,
-                                    ModifierData *md,
-                                    CustomData_MeshMasks *final_datamask,
-                                    int required_mode,
-                                    ModifierData *previewmd,
-                                    const CustomData_MeshMasks *previewmask)
+                                         Object *ob,
+                                         ModifierData *md,
+                                         CustomData_MeshMasks *final_datamask,
+                                         int required_mode,
+                                         ModifierData *previewmd,
+                                         const CustomData_MeshMasks *previewmask)
 {
   CDMaskLink *dataMasks = NULL;
   CDMaskLink *curr, *prev;
@@ -594,7 +596,9 @@ CDMaskLink *BKE_modifier_calc_data_masks(struct Scene *scene,
   return dataMasks;
 }
 
-ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, ModifierData *md, int required_mode)
+ModifierData *BKE_modifier_get_last_preview(struct Scene *scene,
+                                            ModifierData *md,
+                                            int required_mode)
 {
   ModifierData *tmp_md = NULL;
 
@@ -614,7 +618,7 @@ ModifierData *BKE_modifier_get_last_preview(struct Scene *scene, ModifierData *m
 /* This is to include things that are not modifiers in the evaluation of the modifier stack, for
  * example parenting to an armature. */
 ModifierData *BKE_modifiers_get_virtual_modifierlist(const Object *ob,
-                                               VirtualModifierData *virtualModifierData)
+                                                     VirtualModifierData *virtualModifierData)
 {
   ModifierData *md;
 
@@ -932,7 +936,9 @@ void BKE_modifier_path_init(char *path, int path_maxlen, const char *name)
 
 /* wrapper around ModifierTypeInfo.modifyMesh that ensures valid normals */
 
-struct Mesh *BKE_modifier_modify_mesh(ModifierData *md, const ModifierEvalContext *ctx, struct Mesh *me)
+struct Mesh *BKE_modifier_modify_mesh(ModifierData *md,
+                                      const ModifierEvalContext *ctx,
+                                      struct Mesh *me)
 {
   const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   BLI_assert(CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
@@ -944,10 +950,10 @@ struct Mesh *BKE_modifier_modify_mesh(ModifierData *md, const ModifierEvalContex
 }
 
 void BKE_modifier_deform_verts(ModifierData *md,
-                         const ModifierEvalContext *ctx,
-                         Mesh *me,
-                         float (*vertexCos)[3],
-                         int numVerts)
+                               const ModifierEvalContext *ctx,
+                               Mesh *me,
+                               float (*vertexCos)[3],
+                               int numVerts)
 {
   const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   BLI_assert(!me || CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
@@ -959,11 +965,11 @@ void BKE_modifier_deform_verts(ModifierData *md,
 }
 
 void BKE_modifier_deform_vertsEM(ModifierData *md,
-                           const ModifierEvalContext *ctx,
-                           struct BMEditMesh *em,
-                           Mesh *me,
-                           float (*vertexCos)[3],
-                           int numVerts)
+                                 const ModifierEvalContext *ctx,
+                                 struct BMEditMesh *em,
+                                 Mesh *me,
+                                 float (*vertexCos)[3],
+                                 int numVerts)
 {
   const ModifierTypeInfo *mti = BKE_modifier_get_info(md->type);
   BLI_assert(!me || CustomData_has_layer(&me->pdata, CD_NORMAL) == false);
@@ -1016,7 +1022,9 @@ ModifierData *BKE_modifier_get_original(ModifierData *md)
   return md->orig_modifier_data;
 }
 
-struct ModifierData *BKE_modifier_get_evaluated(Depsgraph *depsgraph, Object *object, ModifierData *md)
+struct ModifierData *BKE_modifier_get_evaluated(Depsgraph *depsgraph,
+                                                Object *object,
+                                                ModifierData *md)
 {
   Object *object_eval = DEG_get_evaluated_object(depsgraph, object);
   if (object_eval == object) {
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index ae004738841..52153b6c9ad 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -319,7 +319,7 @@ float (*BKE_multires_create_deformed_base_mesh_vert_coords(struct Depsgraph *dep
 
   VirtualModifierData virtual_modifier_data;
   ModifierData *first_md = BKE_modifiers_get_virtual_modifierlist(&object_for_eval,
-                                                            &virtual_modifier_data);
+                                                                  &virtual_modifier_data);
 
   Mesh *base_mesh = object->data;
 
@@ -341,7 +341,8 @@ float (*BKE_multires_create_deformed_base_mesh_vert_coords(struct Depsgraph *dep
       break;
     }
 
-    BKE_modifier_deform_verts(md, &mesh_eval_context, base_mesh, deformed_verts, num_deformed_verts);
+    BKE_modifier_deform_verts(
+        md, &mesh_eval_context, base_mesh, deformed_verts, num_deformed_verts);
   }
 
   if (r_num_deformed_verts != NULL) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 5ce94d609e2..6bd841ca8e5 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -4045,7 +4045,8 @@ int BKE_object_is_deform_modified(Scene *scene, Object *ob)
     }
 
     if (can_deform) {
-      if (!(flag & eModifierMode_Render) && BKE_modifier_is_enabled(scene, md, eModifierMode_Render)) {
+      if (!(flag & eModifierMode_Render) &&
+          BKE_modifier_is_enabled(scene, md, eModifierMode_Render)) {
         flag |= eModifierMode_Render;
       }
 
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index e1f6d675b84..df74b7a75da 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4183,7 +4183,8 @@ static void particles_fluid_step(ParticleSimulationData *sim,
 #else
   {
     Object *ob = sim->ob;
-    FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Fluid);
+    FluidModifierData *mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob,
+                                                                            eModifierType_Fluid);
 
     if (mmd && mmd->domain && mmd->domain->fluid) {
       FluidDomainSettings *mds = mmd->domain;