[Bf-blender-cvs] [b35b8b6a653] temp-modifier-rm-cddm: Formatting

[Sybren A. Stüvel]

Commit: b35b8b6a653f24fa641ad1660a3b12f20d443e10
Author: Sybren A. Stüvel
Date:   Tue May 1 11:02:58 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rBb35b8b6a653f24fa641ad1660a3b12f20d443e10

Formatting

===================================================================

M	source/blender/blenkernel/BKE_modifier.h
M	source/blender/blenkernel/intern/mesh.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 09614a8e63f..ce83caf2bc6 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -215,7 +215,7 @@ typedef struct ModifierTypeInfo {
 
 	/* Like applyModifier but called during editmode (for supporting
 	 * modifiers).
-	 * 
+	 *
 	 * The derived object that is returned must support the operations that
 	 * are expected from editmode objects. The same qualifications regarding
 	 * derivedData apply as for applyModifier.
@@ -276,8 +276,8 @@ typedef struct ModifierTypeInfo {
 	 * modified form), but must not release it.
 	 */
 	struct Mesh *(*applyModifier)(struct ModifierData *md, struct Depsgraph *depsgraph,
-	                                     struct Object *ob, struct Mesh *mesh,
-	                                     ModifierApplyFlag flag);
+	                              struct Object *ob, struct Mesh *mesh,
+	                              ModifierApplyFlag flag);
 
 	/* Like applyModifier but called during editmode (for supporting
 	 * modifiers).
@@ -287,8 +287,8 @@ typedef struct ModifierTypeInfo {
 	 * mesh apply as for applyModifier.
 	 */
 	struct Mesh *(*applyModifierEM)(struct ModifierData *md, struct Depsgraph *depsgraph,
-	                                       struct Object *ob, struct BMEditMesh *editData,
-	                                       struct Mesh *mesh, ModifierApplyFlag flag);
+	                                struct Object *ob, struct BMEditMesh *editData,
+	                                struct Mesh *mesh, ModifierApplyFlag flag);
 
 
 	/********************* Optional functions *********************/
@@ -515,55 +515,65 @@ void modwrap_deformVertsEM(
  * depending on if the modifier has been ported to Mesh or is still using DerivedMesh
  */
 
-void modifier_deformVerts(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct Mesh *mesh,
-	float (*vertexCos)[3], int numVerts,
-	ModifierApplyFlag flag);
+void modifier_deformVerts(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct Mesh *mesh,
+        float (*vertexCos)[3], int numVerts, ModifierApplyFlag flag);
 
-void modifier_deformMatrices(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct Mesh *mesh,
-	float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
+void modifier_deformMatrices(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct Mesh *mesh,
+        float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
 
-void modifier_deformVertsEM(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh,
-	float (*vertexCos)[3], int numVerts);
+void modifier_deformVertsEM(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh,
+        float (*vertexCos)[3], int numVerts);
 
-void modifier_deformMatricesEM(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh,
-	float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
+void modifier_deformMatricesEM(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct BMEditMesh *editData, struct Mesh *mesh,
+        float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
 
-struct Mesh *modifier_applyModifier(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct Mesh *mesh, ModifierApplyFlag flag);
+struct Mesh *modifier_applyModifier(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct Mesh *mesh, ModifierApplyFlag flag);
 
-struct Mesh *modifier_applyModifierEM(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct BMEditMesh *editData,
-	struct Mesh *mesh, ModifierApplyFlag flag);
+struct Mesh *modifier_applyModifierEM(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct BMEditMesh *editData,
+        struct Mesh *mesh, ModifierApplyFlag flag);
 
 /* depricated variants of above that accept DerivedMesh */
 
-void modifier_deformVerts_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct DerivedMesh *dm,
-	float (*vertexCos)[3], int numVerts,
-	ModifierApplyFlag flag);
+void modifier_deformVerts_DM_deprecated(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct DerivedMesh *dm,
+        float (*vertexCos)[3], int numVerts, ModifierApplyFlag flag);
 
-void modifier_deformMatrices_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct DerivedMesh *dm,
-	float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
+void modifier_deformMatrices_DM_deprecated(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct DerivedMesh *dm,
+        float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
 
-void modifier_deformVertsEM_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm,
-	float (*vertexCos)[3], int numVerts);
+void modifier_deformVertsEM_DM_deprecated(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm,
+        float (*vertexCos)[3], int numVerts);
 
-void modifier_deformMatricesEM_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm,
-	float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
+void modifier_deformMatricesEM_DM_deprecated(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct BMEditMesh *editData, struct DerivedMesh *dm,
+        float (*vertexCos)[3], float (*defMats)[3][3], int numVerts);
 
-struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct DerivedMesh *dm, ModifierApplyFlag flag);
+struct DerivedMesh *modifier_applyModifier_DM_deprecated(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct DerivedMesh *dm, ModifierApplyFlag flag);
 
-struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData *md, struct Depsgraph *depsgraph,
-	struct Object *ob, struct BMEditMesh *editData,
-	struct DerivedMesh *dm, ModifierApplyFlag flag);
+struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(
+        struct ModifierData *md, struct Depsgraph *depsgraph,
+        struct Object *ob, struct BMEditMesh *editData,
+        struct DerivedMesh *dm, ModifierApplyFlag flag);
 
 #endif
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index cb51c1b17fb..62ed9ae5d66 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -2720,7 +2720,6 @@ Mesh *BKE_mesh_new_from_object(
 	return tmpmesh;
 }
 
-
 /* **** Depsgraph evaluation **** */
 
 void BKE_mesh_eval_geometry(Depsgraph *UNUSED(depsgraph),