ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 160 insertions, 112 deletions

diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index b5240faed09..a5d1472727a 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -37,32 +37,32 @@ struct Scene;
 #define DO_INLINE MALWAYS_INLINE
 
 /* goal defines */
-#define SOFTGOALSNAP  0.999f
+#define SOFTGOALSNAP 0.999f
 
 /* This is approximately the smallest number that can be
  * represented by a float, given its precision. */
-#define ALMOST_ZERO		FLT_EPSILON
+#define ALMOST_ZERO FLT_EPSILON
 
 /* Bits to or into the ClothVertex.flags. */
 typedef enum eClothVertexFlag {
-	CLOTH_VERT_FLAG_PINNED      = 1,
-	CLOTH_VERT_FLAG_NOSELFCOLL  = 2, /* vertex NOT used for self collisions */
+  CLOTH_VERT_FLAG_PINNED = 1,
+  CLOTH_VERT_FLAG_NOSELFCOLL = 2, /* vertex NOT used for self collisions */
 } eClothVertexFlag;
 
 typedef struct ClothHairData {
-	float loc[3];
-	float rot[3][3];
-	float rest_target[3]; /* rest target direction for each segment */
-	float radius;
-	float bending_stiffness;
+  float loc[3];
+  float rot[3][3];
+  float rest_target[3]; /* rest target direction for each segment */
+  float radius;
+  float bending_stiffness;
 } ClothHairData;
 
 typedef struct ClothSolverResult {
-	int status;
+  int status;
 
-	int max_iterations, min_iterations;
-	float avg_iterations;
-	float max_error, min_error, avg_error;
+  int max_iterations, min_iterations;
+  float avg_iterations;
+  float max_error, min_error, avg_error;
 } ClothSolverResult;
 
 /**
@@ -75,123 +75,158 @@ typedef struct ClothSolverResult {
  * own connectivity of the mesh based on the actual edges in the mesh.
  */
 typedef struct Cloth {
-	struct ClothVertex	*verts;			/* The vertices that represent this cloth. */
-	struct	LinkNode	*springs;		/* The springs connecting the mesh. */
-	unsigned int		numsprings;		/* The count of springs. */
-	unsigned int		mvert_num;		/* The number of verts == m * n. */
-	unsigned int		tri_num;
-	unsigned char 		old_solver_type;	/* unused, only 1 solver here */
-	unsigned char 		pad2;
-	short 			pad3;
-	struct BVHTree		*bvhtree;			/* collision tree for this cloth object */
-	struct BVHTree 		*bvhselftree;			/* collision tree for this cloth object */
-	struct MVertTri		*tri;
-	struct Implicit_Data	*implicit; 		/* our implicit solver connects to this pointer */
-	struct EdgeSet	 	*edgeset; 		/* used for selfcollisions */
-	int last_frame, pad4;
+  struct ClothVertex *verts; /* The vertices that represent this cloth. */
+  struct LinkNode *springs;  /* The springs connecting the mesh. */
+  unsigned int numsprings;   /* The count of springs. */
+  unsigned int mvert_num;    /* The number of verts == m * n. */
+  unsigned int tri_num;
+  unsigned char old_solver_type; /* unused, only 1 solver here */
+  unsigned char pad2;
+  short pad3;
+  struct BVHTree *bvhtree;     /* collision tree for this cloth object */
+  struct BVHTree *bvhselftree; /* collision tree for this cloth object */
+  struct MVertTri *tri;
+  struct Implicit_Data *implicit; /* our implicit solver connects to this pointer */
+  struct EdgeSet *edgeset;        /* used for selfcollisions */
+  int last_frame, pad4;
 } Cloth;
 
 /**
  * The definition of a cloth vertex.
  */
 typedef struct ClothVertex {
-	int	flags;		/* General flags per vertex.		*/
-	float	v[3];		/* The velocity of the point.		*/
-	float	xconst[3];	/* constrained position			*/
-	float	x[3];		/* The current position of this vertex.	*/
-	float 	xold[3];	/* The previous position of this vertex.*/
-	float	tx[3];		/* temporary position */
-	float 	txold[3];	/* temporary old position */
-	float 	tv[3];		/* temporary "velocity", mostly used as tv = tx-txold */
-	float 	mass;		/* mass / weight of the vertex		*/
-	float 	goal;		/* goal, from SB			*/
-	float	impulse[3];	/* used in collision.c */
-	float	xrest[3];   /* rest position of the vertex */
-	float	dcvel[3];	/* delta velocities to be applied by collision response */
-	unsigned int impulse_count; /* same as above */
-	float 	avg_spring_len; /* average length of connected springs */
-	float 	struct_stiff;
-	float	bend_stiff;
-	float 	shear_stiff;
-	int 	spring_count; /* how many springs attached? */
-	float	shrink_factor; /* how much to shrink this cloth */
-}
-ClothVertex;
+  int flags;                  /* General flags per vertex.        */
+  float v[3];                 /* The velocity of the point.       */
+  float xconst[3];            /* constrained position         */
+  float x[3];                 /* The current position of this vertex. */
+  float xold[3];              /* The previous position of this vertex.*/
+  float tx[3];                /* temporary position */
+  float txold[3];             /* temporary old position */
+  float tv[3];                /* temporary "velocity", mostly used as tv = tx-txold */
+  float mass;                 /* mass / weight of the vertex      */
+  float goal;                 /* goal, from SB            */
+  float impulse[3];           /* used in collision.c */
+  float xrest[3];             /* rest position of the vertex */
+  float dcvel[3];             /* delta velocities to be applied by collision response */
+  unsigned int impulse_count; /* same as above */
+  float avg_spring_len;       /* average length of connected springs */
+  float struct_stiff;
+  float bend_stiff;
+  float shear_stiff;
+  int spring_count;    /* how many springs attached? */
+  float shrink_factor; /* how much to shrink this cloth */
+} ClothVertex;
 
 /**
  * The definition of a spring.
  */
 typedef struct ClothSpring {
-	int	ij;		/* Pij from the paper, one end of the spring.	*/
-	int	kl;		/* Pkl from the paper, one end of the spring.	*/
-	int mn;		/* For hair springs: third vertex index; For bending springs: edge index; */
-	int *pa;	/* Array of vert indices for poly a (for bending springs). */
-	int *pb;	/* Array of vert indices for poly b (for bending springs). */
-	int la;		/* Length of *pa. */
-	int lb;		/* Length of *pb. */
-	float restlen;	/* The original length of the spring. */
-	float restang;	/* The original angle of the bending springs. */
-	int	type;		/* Types defined in BKE_cloth.h ("springType"). */
-	int	flags; 		/* Defined in BKE_cloth.h, e.g. deactivated due to tearing. */
-	float lin_stiffness;	/* Linear stiffness factor from the vertex groups. */
-	float ang_stiffness;	/* Angular stiffness factor from the vertex groups. */
-	float editrestlen;
-
-	/* angular bending spring target and derivatives */
-	float target[3];
-}
-ClothSpring;
+  int ij;              /* Pij from the paper, one end of the spring.   */
+  int kl;              /* Pkl from the paper, one end of the spring.   */
+  int mn;              /* For hair springs: third vertex index; For bending springs: edge index; */
+  int *pa;             /* Array of vert indices for poly a (for bending springs). */
+  int *pb;             /* Array of vert indices for poly b (for bending springs). */
+  int la;              /* Length of *pa. */
+  int lb;              /* Length of *pb. */
+  float restlen;       /* The original length of the spring. */
+  float restang;       /* The original angle of the bending springs. */
+  int type;            /* Types defined in BKE_cloth.h ("springType"). */
+  int flags;           /* Defined in BKE_cloth.h, e.g. deactivated due to tearing. */
+  float lin_stiffness; /* Linear stiffness factor from the vertex groups. */
+  float ang_stiffness; /* Angular stiffness factor from the vertex groups. */
+  float editrestlen;
+
+  /* angular bending spring target and derivatives */
+  float target[3];
+} ClothSpring;
 
 // some macro enhancements for vector treatment
-#define VECSUBADDSS(v1,v2,aS,v3,bS) 	{*(v1)-= *(v2)*aS + *(v3)*bS; *(v1+1)-= *(v2+1)*aS + *(v3+1)*bS; *(v1+2)-= *(v2+2)*aS + *(v3+2)*bS;} ((void)0)
-#define VECADDSS(v1,v2,aS,v3,bS) 	{*(v1)= *(v2)*aS + *(v3)*bS; *(v1+1)= *(v2+1)*aS + *(v3+1)*bS; *(v1+2)= *(v2+2)*aS + *(v3+2)*bS;} ((void)0)
-#define VECADDS(v1,v2,v3,bS) 	{*(v1)= *(v2) + *(v3)*bS; *(v1+1)= *(v2+1) + *(v3+1)*bS; *(v1+2)= *(v2+2) + *(v3+2)*bS;} ((void)0)
-#define VECSUBMUL(v1,v2,aS) 	{*(v1)-= *(v2) * aS; *(v1+1)-= *(v2+1) * aS; *(v1+2)-= *(v2+2) * aS;} ((void)0)
-#define VECSUBS(v1,v2,v3,bS) 	{*(v1)= *(v2) - *(v3)*bS; *(v1+1)= *(v2+1) - *(v3+1)*bS; *(v1+2)= *(v2+2) - *(v3+2)*bS;} ((void)0)
-#define VECADDMUL(v1,v2,aS) 	{*(v1)+= *(v2) * aS; *(v1+1)+= *(v2+1) * aS; *(v1+2)+= *(v2+2) * aS;} ((void)0)
+#define VECSUBADDSS(v1, v2, aS, v3, bS) \
+  { \
+    *(v1) -= *(v2)*aS + *(v3)*bS; \
+    *(v1 + 1) -= *(v2 + 1) * aS + *(v3 + 1) * bS; \
+    *(v1 + 2) -= *(v2 + 2) * aS + *(v3 + 2) * bS; \
+  } \
+  ((void)0)
+#define VECADDSS(v1, v2, aS, v3, bS) \
+  { \
+    *(v1) = *(v2)*aS + *(v3)*bS; \
+    *(v1 + 1) = *(v2 + 1) * aS + *(v3 + 1) * bS; \
+    *(v1 + 2) = *(v2 + 2) * aS + *(v3 + 2) * bS; \
+  } \
+  ((void)0)
+#define VECADDS(v1, v2, v3, bS) \
+  { \
+    *(v1) = *(v2) + *(v3)*bS; \
+    *(v1 + 1) = *(v2 + 1) + *(v3 + 1) * bS; \
+    *(v1 + 2) = *(v2 + 2) + *(v3 + 2) * bS; \
+  } \
+  ((void)0)
+#define VECSUBMUL(v1, v2, aS) \
+  { \
+    *(v1) -= *(v2)*aS; \
+    *(v1 + 1) -= *(v2 + 1) * aS; \
+    *(v1 + 2) -= *(v2 + 2) * aS; \
+  } \
+  ((void)0)
+#define VECSUBS(v1, v2, v3, bS) \
+  { \
+    *(v1) = *(v2) - *(v3)*bS; \
+    *(v1 + 1) = *(v2 + 1) - *(v3 + 1) * bS; \
+    *(v1 + 2) = *(v2 + 2) - *(v3 + 2) * bS; \
+  } \
+  ((void)0)
+#define VECADDMUL(v1, v2, aS) \
+  { \
+    *(v1) += *(v2)*aS; \
+    *(v1 + 1) += *(v2 + 1) * aS; \
+    *(v1 + 2) += *(v2 + 2) * aS; \
+  } \
+  ((void)0)
 
 /* SIMULATION FLAGS: goal flags,.. */
 /* These are the bits used in SimSettings.flags. */
 typedef enum {
-	CLOTH_SIMSETTINGS_FLAG_COLLOBJ = ( 1 << 2 ),// object is only collision object, no cloth simulation is done
-	CLOTH_SIMSETTINGS_FLAG_GOAL = ( 1 << 3 ), /* DEPRECATED, for versioning only. */
-	CLOTH_SIMSETTINGS_FLAG_TEARING = ( 1 << 4 ),// true if tearing is enabled
-	CLOTH_SIMSETTINGS_FLAG_SCALING = ( 1 << 8 ), /* DEPRECATED, for versioning only. */
-	CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12),	/* edit cache in editmode */
-	CLOTH_SIMSETTINGS_FLAG_RESIST_SPRING_COMPRESS = (1 << 13), /* don't allow spring compression */
-	CLOTH_SIMSETTINGS_FLAG_SEW = (1 << 14), /* pull ends of loose edges together */
-	CLOTH_SIMSETTINGS_FLAG_DYNAMIC_BASEMESH = (1 << 15), /* make simulation respect deformations in the base object */
+  CLOTH_SIMSETTINGS_FLAG_COLLOBJ =
+      (1 << 2),  // object is only collision object, no cloth simulation is done
+  CLOTH_SIMSETTINGS_FLAG_GOAL = (1 << 3),                    /* DEPRECATED, for versioning only. */
+  CLOTH_SIMSETTINGS_FLAG_TEARING = (1 << 4),                 // true if tearing is enabled
+  CLOTH_SIMSETTINGS_FLAG_SCALING = (1 << 8),                 /* DEPRECATED, for versioning only. */
+  CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12),            /* edit cache in editmode */
+  CLOTH_SIMSETTINGS_FLAG_RESIST_SPRING_COMPRESS = (1 << 13), /* don't allow spring compression */
+  CLOTH_SIMSETTINGS_FLAG_SEW = (1 << 14), /* pull ends of loose edges together */
+  CLOTH_SIMSETTINGS_FLAG_DYNAMIC_BASEMESH =
+      (1 << 15), /* make simulation respect deformations in the base object */
 } CLOTH_SIMSETTINGS_FLAGS;
 
 /* ClothSimSettings.bending_model. */
 typedef enum {
-	CLOTH_BENDING_LINEAR	= 0,
-	CLOTH_BENDING_ANGULAR	= 1,
+  CLOTH_BENDING_LINEAR = 0,
+  CLOTH_BENDING_ANGULAR = 1,
 } CLOTH_BENDING_MODEL;
 
 /* COLLISION FLAGS */
 typedef enum {
-	CLOTH_COLLSETTINGS_FLAG_ENABLED = ( 1 << 1 ), /* enables cloth - object collisions */
-	CLOTH_COLLSETTINGS_FLAG_SELF = ( 1 << 2 ), /* enables selfcollisions */
+  CLOTH_COLLSETTINGS_FLAG_ENABLED = (1 << 1), /* enables cloth - object collisions */
+  CLOTH_COLLSETTINGS_FLAG_SELF = (1 << 2),    /* enables selfcollisions */
 } CLOTH_COLLISIONSETTINGS_FLAGS;
 
 /* Spring types as defined in the paper.*/
 typedef enum {
-	CLOTH_SPRING_TYPE_STRUCTURAL   = (1 << 1),
-	CLOTH_SPRING_TYPE_SHEAR        = (1 << 2),
-	CLOTH_SPRING_TYPE_BENDING      = (1 << 3),
-	CLOTH_SPRING_TYPE_GOAL         = (1 << 4),
-	CLOTH_SPRING_TYPE_SEWING       = (1 << 5),
-	CLOTH_SPRING_TYPE_BENDING_HAIR = (1 << 6),
+  CLOTH_SPRING_TYPE_STRUCTURAL = (1 << 1),
+  CLOTH_SPRING_TYPE_SHEAR = (1 << 2),
+  CLOTH_SPRING_TYPE_BENDING = (1 << 3),
+  CLOTH_SPRING_TYPE_GOAL = (1 << 4),
+  CLOTH_SPRING_TYPE_SEWING = (1 << 5),
+  CLOTH_SPRING_TYPE_BENDING_HAIR = (1 << 6),
 } CLOTH_SPRING_TYPES;
 
 /* SPRING FLAGS */
 typedef enum {
-	CLOTH_SPRING_FLAG_DEACTIVATE = ( 1 << 1 ),
-	CLOTH_SPRING_FLAG_NEEDED = ( 1 << 2 ), // springs has values to be applied
+  CLOTH_SPRING_FLAG_DEACTIVATE = (1 << 1),
+  CLOTH_SPRING_FLAG_NEEDED = (1 << 2),  // springs has values to be applied
 } CLOTH_SPRINGS_FLAGS;
 
-
 /////////////////////////////////////////////////
 // collision.c
 ////////////////////////////////////////////////
@@ -199,18 +234,27 @@ typedef enum {
 struct CollPair;
 
 typedef struct ColliderContacts {
-	struct Object *ob;
-	struct CollisionModifierData *collmd;
+  struct Object *ob;
+  struct CollisionModifierData *collmd;
 
-	struct CollPair *collisions;
-	int totcollisions;
+  struct CollPair *collisions;
+  int totcollisions;
 } ColliderContacts;
 
 // needed for implicit.c
-int cloth_bvh_collision(struct Depsgraph *depsgraph, struct Object *ob, struct ClothModifierData *clmd, float step, float dt);
-
-void cloth_find_point_contacts(struct Depsgraph *depsgraph, struct Object *ob, struct ClothModifierData *clmd, float step, float dt,
-                               ColliderContacts **r_collider_contacts, int *r_totcolliders);
+int cloth_bvh_collision(struct Depsgraph *depsgraph,
+                        struct Object *ob,
+                        struct ClothModifierData *clmd,
+                        float step,
+                        float dt);
+
+void cloth_find_point_contacts(struct Depsgraph *depsgraph,
+                               struct Object *ob,
+                               struct ClothModifierData *clmd,
+                               float step,
+                               float dt,
+                               ColliderContacts **r_collider_contacts,
+                               int *r_totcolliders);
 void cloth_free_contacts(ColliderContacts *collider_contacts, int totcolliders);
 
 ////////////////////////////////////////////////
@@ -220,12 +264,15 @@ void cloth_free_contacts(ColliderContacts *collider_contacts, int totcolliders);
 ////////////////////////////////////////////////
 
 // needed for modifier.c
-void cloth_free_modifier_extern (struct ClothModifierData *clmd );
-void cloth_free_modifier (struct ClothModifierData *clmd );
-void cloth_init (struct ClothModifierData *clmd );
-void clothModifier_do(
-        struct ClothModifierData *clmd, struct Depsgraph *depsgraph, struct Scene *scene,
-        struct Object *ob, struct Mesh *me, float (*vertexCos)[3]);
+void cloth_free_modifier_extern(struct ClothModifierData *clmd);
+void cloth_free_modifier(struct ClothModifierData *clmd);
+void cloth_init(struct ClothModifierData *clmd);
+void clothModifier_do(struct ClothModifierData *clmd,
+                      struct Depsgraph *depsgraph,
+                      struct Scene *scene,
+                      struct Object *ob,
+                      struct Mesh *me,
+                      float (*vertexCos)[3]);
 
 int cloth_uses_vgroup(struct ClothModifierData *clmd);
 
@@ -233,10 +280,11 @@ int cloth_uses_vgroup(struct ClothModifierData *clmd);
 void bvhtree_update_from_cloth(struct ClothModifierData *clmd, bool moving, bool self);
 
 // needed for button_object.c
-void cloth_clear_cache(
-        struct Object *ob, struct ClothModifierData *clmd, float framenr );
+void cloth_clear_cache(struct Object *ob, struct ClothModifierData *clmd, float framenr);
 
-void cloth_parallel_transport_hair_frame(float mat[3][3], const float dir_old[3], const float dir_new[3]);
+void cloth_parallel_transport_hair_frame(float mat[3][3],
+                                         const float dir_old[3],
+                                         const float dir_new[3]);
 
 ////////////////////////////////////////////////