Cleanup: style, duplicate includes

8 files changed, 17 insertions, 15 deletions

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 2c44179c735..e517b65cf3e 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -188,7 +188,7 @@ void        BKE_scene_multiview_videos_dimensions_get(const struct RenderData *r
 int         BKE_scene_multiview_num_videos_get(const struct RenderData *rd);
 
 /* depsgraph */
-struct Depsgraph* BKE_scene_get_depsgraph(struct Scene *scene, struct SceneLayer *scene_layer);
+struct Depsgraph *BKE_scene_get_depsgraph(struct Scene *scene, struct SceneLayer *scene_layer);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index eb35f3daad0..3bf5784e674 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1344,7 +1344,7 @@ const CustomDataMask CD_MASK_BMESH =
     CD_MASK_PROP_STR | CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_MDISPS |
     CD_MASK_CREASE | CD_MASK_BWEIGHT | CD_MASK_RECAST | CD_MASK_PAINT_MASK |
     CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE |
-	CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
+    CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
 /**
  * cover values copied by #BKE_mesh_loops_to_tessdata
  */
diff --git a/source/blender/blenkernel/intern/editmesh_tangent.c b/source/blender/blenkernel/intern/editmesh_tangent.c
index 589c346b248..f725a1793b4 100644
--- a/source/blender/blenkernel/intern/editmesh_tangent.c
+++ b/source/blender/blenkernel/intern/editmesh_tangent.c
@@ -301,11 +301,14 @@ void BKE_editmesh_loop_tangent_calc(
 	        &calc_act, &calc_ren, &act_uv_n, &ren_uv_n, act_uv_name, ren_uv_name, &tangent_mask);
 
 	if ((tangent_mask_curr | tangent_mask) != tangent_mask_curr) {
-		for (int i = 0; i < tangent_names_len; i++)
-			if (tangent_names[i][0])
-				BKE_mesh_add_loop_tangent_named_layer_for_uv(&bm->ldata, loopdata_out, (int)loopdata_out_len, tangent_names[i]);
+		for (int i = 0; i < tangent_names_len; i++) {
+			if (tangent_names[i][0]) {
+				BKE_mesh_add_loop_tangent_named_layer_for_uv(
+				        &bm->ldata, loopdata_out, (int)loopdata_out_len, tangent_names[i]);
+			}
+		}
 		if ((tangent_mask & DM_TANGENT_MASK_ORCO) && CustomData_get_named_layer_index(loopdata_out, CD_TANGENT, "") == -1)
-					CustomData_add_layer_named(loopdata_out, CD_TANGENT, CD_CALLOC, NULL, (int)loopdata_out_len, "");
+			CustomData_add_layer_named(loopdata_out, CD_TANGENT, CD_CALLOC, NULL, (int)loopdata_out_len, "");
 		if (calc_act && act_uv_name[0])
 			BKE_mesh_add_loop_tangent_named_layer_for_uv(&bm->ldata, loopdata_out, (int)loopdata_out_len, act_uv_name);
 		if (calc_ren && ren_uv_name[0])
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 126a2b7bb6c..f20b96b8bc7 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -1420,7 +1420,7 @@ void BKE_collection_engine_property_add_float_array(
 	val.array.len = array_length;
 	val.array.type = IDP_FLOAT;
 
-	IDProperty *idprop= IDP_New(IDP_ARRAY, &val, name);
+	IDProperty *idprop = IDP_New(IDP_ARRAY, &val, name);
 	memcpy(IDP_Array(idprop), values, sizeof(float) * idprop->len);
 	IDP_AddToGroup(props, idprop);
 }
diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c
index 5601fa5ad42..03bd2344f7b 100644
--- a/source/blender/blenkernel/intern/lightprobe.c
+++ b/source/blender/blenkernel/intern/lightprobe.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenkernel/intern/probe.c
+/** \file blender/blenkernel/intern/lightprobe.c
  *  \ingroup bke
  */
 
diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c
index c1b74b3eb6f..77288bd672e 100644
--- a/source/blender/blenkernel/intern/mesh_tangent.c
+++ b/source/blender/blenkernel/intern/mesh_tangent.c
@@ -230,8 +230,6 @@ typedef struct {
 } SGLSLMeshToTangent;
 
 /* interface */
-#include "mikktspace.h"
-
 static int dm_ts_GetNumFaces(const SMikkTSpaceContext *pContext)
 {
 	SGLSLMeshToTangent *pMesh = pContext->m_pUserData;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index fca0ff92a45..d36f128cef1 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -169,7 +169,8 @@ static void scene_collection_copy(SceneCollection *sc_dst, SceneCollection *sc_s
 	BLI_duplicatelist(&sc_dst->scene_collections, &sc_src->scene_collections);
 	for (SceneCollection *nsc_src = sc_src->scene_collections.first, *nsc_dst = sc_dst->scene_collections.first;
 	     nsc_src;
-	     nsc_src = nsc_src->next, nsc_dst = nsc_dst->next) {
+	     nsc_src = nsc_src->next, nsc_dst = nsc_dst->next)
+	{
 		scene_collection_copy(nsc_dst, nsc_src, flag);
 	}
 }
@@ -2330,7 +2331,7 @@ int BKE_scene_multiview_num_videos_get(const RenderData *rd)
 	}
 }
 
-Depsgraph* BKE_scene_get_depsgraph(Scene *scene, SceneLayer *scene_layer)
+Depsgraph *BKE_scene_get_depsgraph(Scene *scene, SceneLayer *scene_layer)
 {
 	(void) scene_layer;
 	return scene->depsgraph_legacy;
diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c
index 65eb08aba27..05dab9208e5 100644
--- a/source/blender/blenkernel/intern/workspace.c
+++ b/source/blender/blenkernel/intern/workspace.c
@@ -117,11 +117,11 @@ static void *workspace_relation_get_data_matching_parent(
  * Hence, this should only be used as assert check before assigining a screen to a workspace.
  */
 #ifndef NDEBUG
-static bool workspaces_is_screen_used(
+static bool workspaces_is_screen_used
 #else
-static bool UNUSED_FUNCTION(workspaces_is_screen_used)(
+static bool UNUSED_FUNCTION(workspaces_is_screen_used)
 #endif
-        const Main *bmain, bScreen *screen)
+        (const Main *bmain, bScreen *screen)
 {
 	for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
 		if (workspace_layout_find_exec(workspace, screen)) {