Cleanup: whitespace, duplicate includes

4 files changed, 66 insertions, 57 deletions

diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index b8d9e5a9af9..57d70afcb8b 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -176,55 +176,64 @@ struct bPose;
 struct bSplineIKConstraint;
 
 struct bPoseChannel *BKE_armature_ik_solver_find_root(
-				struct bPoseChannel *pchan,
-				struct bKinematicConstraint *data);
+        struct bPoseChannel *pchan,
+        struct bKinematicConstraint *data);
 struct bPoseChannel *BKE_armature_splineik_solver_find_root(
-				struct bPoseChannel *pchan,
-				struct bSplineIKConstraint *data);
+        struct bPoseChannel *pchan,
+        struct bSplineIKConstraint *data);
 
 void BKE_pose_splineik_init_tree(struct Scene *scene, struct Object *ob, float ctime);
 void BKE_splineik_execute_tree(
-				struct Depsgraph *depsgraph, struct Scene *scene,
-				struct Object *ob, struct bPoseChannel *pchan_root, float ctime);
-
-void BKE_pose_eval_init(struct Depsgraph *depsgraph,
-												struct Scene *scene,
-												struct Object *ob);
-
-void BKE_pose_eval_init_ik(struct Depsgraph *depsgraph,
-													 struct Scene *scene,
-													 struct Object *ob);
-
-void BKE_pose_eval_bone(struct Depsgraph *depsgraph,
-												struct Scene *scene,
-												struct Object *ob,
-												int pchan_index);
-
-void BKE_pose_constraints_evaluate(struct Depsgraph *depsgraph,
-																	 struct Scene *scene,
-																	 struct Object *ob,
-																	 int pchan_index);
-
-void BKE_pose_bone_done(struct Depsgraph *depsgraph,
-												struct Object *ob,
-												int pchan_index);
-
-void BKE_pose_iktree_evaluate(struct Depsgraph *depsgraph,
-															struct Scene *scene,
-															struct Object *ob,
-															int rootchan_index);
-
-void BKE_pose_splineik_evaluate(struct Depsgraph *depsgraph,
-																struct Scene *scene,
-																struct Object *ob,
-																int rootchan_index);
-
-void BKE_pose_eval_flush(struct Depsgraph *depsgraph,
-												 struct Scene *scene,
-												 struct Object *ob);
-
-void BKE_pose_eval_proxy_copy(struct Depsgraph *depsgraph,
-															struct Object *ob);
+        struct Depsgraph *depsgraph, struct Scene *scene,
+        struct Object *ob, struct bPoseChannel *pchan_root, float ctime);
+
+void BKE_pose_eval_init(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob);
+
+void BKE_pose_eval_init_ik(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob);
+
+void BKE_pose_eval_bone(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob,
+        int pchan_index);
+
+void BKE_pose_constraints_evaluate(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob,
+        int pchan_index);
+
+void BKE_pose_bone_done(
+        struct Depsgraph *depsgraph,
+        struct Object *ob,
+        int pchan_index);
+
+void BKE_pose_iktree_evaluate(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob,
+        int rootchan_index);
+
+void BKE_pose_splineik_evaluate(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob,
+        int rootchan_index);
+
+void BKE_pose_eval_flush(
+        struct Depsgraph *depsgraph,
+        struct Scene *scene,
+        struct Object *ob);
+
+void BKE_pose_eval_proxy_copy(
+        struct Depsgraph *depsgraph,
+        struct Object *ob);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 6e10bc71cb5..cce637aa4ba 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -101,7 +101,7 @@ struct Mesh *BKE_mesh_copy(struct Main *bmain, const struct Mesh *me);
 void BKE_mesh_update_customdata_pointers(struct Mesh *me, const bool do_ensure_tess_cd);
 void BKE_mesh_ensure_skin_customdata(struct Mesh *me);
 
-struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces,int numLoops, int numPolys);
+struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys);
 struct Mesh *BKE_mesh_from_template(
         const struct Mesh *me_src,
         int numVerts, int numEdges, int numTessFaces,
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index fd66b8faf77..4fe2c3bf1ec 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -51,7 +51,6 @@
 #include "BKE_main.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
-#include "BKE_idcode.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_displist.h"
@@ -615,13 +614,14 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int
 	}
 }
 
-Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces,int numLoops, int numPolys)
+Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys)
 {
-	Mesh *mesh = BKE_libblock_alloc(NULL, ID_ME,
-	                                BKE_idcode_to_name(ID_ME),
-	                                LIB_ID_CREATE_NO_MAIN |
-	                                LIB_ID_CREATE_NO_USER_REFCOUNT |
-								    LIB_ID_CREATE_NO_DEG_TAG);
+	Mesh *mesh = BKE_libblock_alloc(
+	        NULL, ID_ME,
+	        BKE_idcode_to_name(ID_ME),
+	        LIB_ID_CREATE_NO_MAIN |
+	        LIB_ID_CREATE_NO_USER_REFCOUNT |
+	        LIB_ID_CREATE_NO_DEG_TAG);
 	BKE_libblock_init_empty(&mesh->id);
 
 	/* don't use CustomData_reset(...); because we dont want to touch customdata */
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 54e5848c2e6..8049c23c439 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -962,7 +962,7 @@ struct Mesh *modifier_applyModifier(struct ModifierData *md, const ModifierEvalC
 
 		DerivedMesh *ndm = mti->applyModifier_DM(md, ctx, dm);
 
-		if(ndm != dm) {
+		if (ndm != dm) {
 			dm->release(dm);
 		}
 
@@ -986,7 +986,7 @@ struct Mesh *modifier_applyModifierEM(struct ModifierData *md, const ModifierEva
 
 		DerivedMesh *ndm = mti->applyModifierEM_DM(md, ctx, editData, dm);
 
-		if(ndm != dm) {
+		if (ndm != dm) {
 			dm->release(dm);
 		}
 
@@ -1120,7 +1120,7 @@ struct DerivedMesh *modifier_applyModifier_DM_deprecated(struct ModifierData *md
 		/* Make a DM that doesn't reference new_mesh so we can free the latter. */
 		DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE);
 
-		if(new_mesh != mesh) {
+		if (new_mesh != mesh) {
 			BKE_id_free(NULL, new_mesh);
 		}
 		if (mesh != NULL) {
@@ -1153,7 +1153,7 @@ struct DerivedMesh *modifier_applyModifierEM_DM_deprecated(struct ModifierData *
 		/* Make a DM that doesn't reference new_mesh so we can free the latter. */
 		DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE);
 
-		if(new_mesh != mesh) {
+		if (new_mesh != mesh) {
 			BKE_id_free(NULL, new_mesh);
 		}
 		if (mesh != NULL) {