Cleanup: style, duplicate includes

source/blender/blenkernel/intern/editmesh_tangent.c

@@ -301,9 +301,12 @@ 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++)
+		for (int i = 0; i < tangent_names_len; i++) {
-			if (tangent_names[i][0])
+			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]);
+				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, "");
 		if (calc_act && act_uv_name[0])

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
  */
 

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;

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);
 	}
 }

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)) {

source/blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc

@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph's nodes

source/blender/depsgraph/intern/builder/deg_builder_relations.cc

@@ -1413,7 +1413,8 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob)
 		}
 		else if ((psys->flag & PSYS_HAIR_DYNAMICS) &&
 		         psys->clmd != NULL &&
-		         psys->clmd->coll_parms != NULL) {
+		         psys->clmd->coll_parms != NULL)
+		{
 			add_collision_relations(psys_key,
 			                        scene,
 			                        ob,

source/blender/depsgraph/intern/builder/deg_builder_relations_layer.cc

@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph

source/blender/depsgraph/intern/depsgraph.cc

@@ -296,7 +296,8 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint)
 		 * referencing to.
 		 */
 		BLI_ghash_insert(id_hash, id, id_node);
-	} else if (do_tag) {
+	}
+	else if (do_tag) {
 		id->tag |= LIB_TAG_DOIT;
 	}
 	return id_node;

source/blender/depsgraph/intern/depsgraph_query.cc

@@ -225,9 +225,8 @@ void DEG_objects_iterator_next(BLI_Iterator *iter)
 		BLI_assert(!BLI_listbase_is_empty(&base->collection_properties->data.group));
 
 		/* Flushing depsgraph data. */
-		deg_flush_base_flags_and_settings(ob,
+		deg_flush_base_flags_and_settings(
-										  base,
+		        ob, base, data->base_flag);
-										  data->base_flag);
 
 		if ((data->flag & DEG_OBJECT_ITER_FLAG_DUPLI) && (ob->transflag & OB_DUPLI)) {
 			data->dupli_parent = ob;

source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc

@@ -25,7 +25,7 @@
  */
 
 
-/** \file blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
+/** \file blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
  *  \ingroup depsgraph
  */
 
@@ -65,9 +65,7 @@ extern "C" {
 #  include "DNA_lamp_types.h"
 #  include "DNA_linestyle_types.h"
 #  include "DNA_material_types.h"
-#  include "DNA_mesh_types.h"
 #  include "DNA_node_types.h"
-#  include "DNA_scene_types.h"
 #  include "DNA_texture_types.h"
 #  include "DNA_world_types.h"
 #endif

source/blender/draw/engines/basic/basic_engine.c

@@ -19,7 +19,7 @@
  *
  */
 
-/** \file basic_engine.h
+/** \file basic_engine.c
  *  \ingroup draw_engine
  *
  * Simple engine for drawing color and/or depth.

source/blender/draw/engines/eevee/eevee_lightprobes.c

@@ -19,7 +19,7 @@
  *
  */
 
-/** \file eevee_lights.c
+/** \file eevee_lightprobes.c
  *  \ingroup DNA
  */
 
@@ -36,8 +36,6 @@
 
 #include "ED_screen.h"
 
-#include "DRW_render.h"
-
 #include "GPU_material.h"
 #include "GPU_texture.h"
 #include "GPU_glew.h"

source/blender/draw/engines/eevee/eevee_lights.c

@@ -463,12 +463,12 @@ static void eevee_light_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngi
 
 	/* Make illumination power constant */
 	if (la->type == LA_AREA) {
-		power = 1.0f / (evli->sizex * evli->sizey * 4.0f * M_PI) /* 1/(w*h*Pi) */
+		power = 1.0f / (evli->sizex * evli->sizey * 4.0f * M_PI) * /* 1/(w*h*Pi) */
-		        * 80.0f; /* XXX : Empirical, Fit cycles power */
+		        80.0f; /* XXX : Empirical, Fit cycles power */
 	}
 	else if (la->type == LA_SPOT || la->type == LA_LOCAL) {
-		power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI) /* 1/(4*r²*Pi²) */
+		power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI) * /* 1/(4*r²*Pi²) */
-		        * M_PI * M_PI * M_PI * 10.0; /* XXX : Empirical, Fit cycles power */
+		        M_PI * M_PI * M_PI * 10.0; /* XXX : Empirical, Fit cycles power */
 
 		/* for point lights (a.k.a radius == 0.0) */
 		// power = M_PI * M_PI * 0.78; /* XXX : Empirical, Fit cycles power */

source/blender/draw/engines/eevee/eevee_lut.h

@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file eeveee_lut.h
+/** \file eevee_lut.h
  *  \ingroup gpu
  */
 

source/blender/draw/engines/external/external_engine.c

@@ -19,7 +19,7 @@
  *
  */
 
-/** \file external_engine.h
+/** \file external_engine.c
  *  \ingroup draw_engine
  *
  * Base engine for external render engines.

source/blender/draw/modes/object_mode.c

@@ -48,7 +48,6 @@
 #include "BKE_image.h"
 #include "BKE_texture.h"
 
-#include "ED_view3d.h"
 #include "ED_view3d.h"
 
 #include "GPU_shader.h"
@@ -487,7 +486,8 @@ static void OBJECT_engine_init(void *vedata)
 			/* Persp : If camera is below floor plane, we switch clipping
 			 * Ortho : If eye vector is looking up, we switch clipping */
 			if (((winmat[3][3] == 0.0f) && (e_data.camera_pos[2] > 0.0f)) ||
-				((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f))) {
+			    ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f)))
+			{
 				e_data.zpos_flag |= CLIP_ZPOS;
 				e_data.zneg_flag |= CLIP_ZNEG;
 			}

source/blender/editors/space_node/space_node.c

@@ -49,8 +49,6 @@
 #include "ED_node.h"
 #include "ED_render.h"
 #include "ED_screen.h"
-#include "WM_api.h"
-#include "WM_types.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -58,6 +56,7 @@
 #include "RNA_access.h"
 
 #include "WM_api.h"
+#include "WM_types.h"
 
 #include "node_intern.h"  /* own include */
 

source/blender/editors/space_time/space_time.c

@@ -333,9 +333,7 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, cons
 
 		immBeginAtMost(GWN_PRIM_LINES, max_len * 2);
 
-		for (; (ak) && (ak->cfra <= v2d->cur.xmax);
+		for (; (ak) && (ak->cfra <= v2d->cur.xmax); ak = ak->next) {
-			ak = ak->next)
-		{
 			immVertex2f(pos, ak->cfra, ymin);
 			immVertex2f(pos, ak->cfra, ymax);
 		}

source/blender/editors/space_view3d/drawarmature.c

@@ -2245,8 +2245,11 @@ static void draw_pose_bones(
 						if (arm->flag & ARM_POSEMODE) {
 							if (constflag & PCHAN_HAS_IK) {
 								if (bone->flag & BONE_SELECTED) {
-									if (constflag & PCHAN_HAS_TARGET) rgba_float_args_set(fcolor, 200.f/255.f, 120.f/255.f, 0.f/255.f, 1.0f);
+									if (constflag & PCHAN_HAS_TARGET) {
-									else rgba_float_args_set(fcolor, 200.f/255.f, 200.f/255.f, 50.f/255.f, 1.0f);  /* add theme! */
+										rgba_float_args_set(fcolor, 200.f / 255.f, 120.f / 255.f, 0.f / 255.f, 1.0f);
+									}
+									/* add theme! */
+									else rgba_float_args_set(fcolor, 200.f / 255.f, 200.f / 255.f, 50.f / 255.f, 1.0f);
 
 									GPU_select_load_id(index & 0xFFFF);
 									pchan_draw_IK_root_lines(pchan, !(do_dashed & DASH_HELP_LINES));
@@ -2254,7 +2257,8 @@ static void draw_pose_bones(
 							}
 							else if (constflag & PCHAN_HAS_SPLINEIK) {
 								if (bone->flag & BONE_SELECTED) {
-									rgba_float_args_set(fcolor, 150.f/255.f, 200.f/255.f, 50.f/255.f, 1.0f);  /* add theme! */
+									/* add theme! */
+									rgba_float_args_set(fcolor, 150.f / 255.f, 200.f / 255.f, 50.f / 255.f, 1.0f);
 
 									GPU_select_load_id(index & 0xFFFF);
 									pchan_draw_IK_root_lines(pchan, !(do_dashed & DASH_HELP_LINES));

source/blender/editors/space_view3d/view3d_draw.c

@@ -64,13 +64,11 @@
 
 #include "DRW_engine.h"
 
-#include "ED_keyframing.h"
 #include "ED_armature.h"
 #include "ED_keyframing.h"
 #include "ED_gpencil.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
-#include "ED_gpencil.h"
 
 #include "DEG_depsgraph_query.h"
 

source/blender/editors/space_view3d/view3d_draw_legacy.c

@@ -72,8 +72,6 @@
 
 #include "DEG_depsgraph.h"
 
-#include "RE_engine.h"
-
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"

source/blender/editors/space_view3d/view3d_edit.c

@@ -3676,8 +3676,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 		new_dist = rv3d->dist;
 
 		/* convert the drawn rectangle into 3d space */
-		if (depth_close != FLT_MAX && ED_view3d_unproject(ar, centx, centy, depth_close, p))
+		if (depth_close != FLT_MAX && ED_view3d_unproject(ar, centx, centy, depth_close, p)) {
-		{
 			negate_v3_v3(new_ofs, p);
 		}
 		else {
@@ -4940,8 +4939,7 @@ bool ED_view3d_autodist(
 		float centx = (float)mval[0] + 0.5f;
 		float centy = (float)mval[1] + 0.5f;
 
-		if (ED_view3d_unproject(ar, centx, centy, depth_close, mouse_worldloc))
+		if (ED_view3d_unproject(ar, centx, centy, depth_close, mouse_worldloc)) {
-		{
 			return true;
 		}
 	}

source/blender/editors/uvedit/uvedit_smart_stitch.c

@@ -1574,8 +1574,9 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
 	UI_GetThemeColor4fv(TH_STITCH_PREVIEW_ACTIVE, col);
 	vbo = GWN_vertbuf_create_with_format(&format);
 	GWN_vertbuf_data_alloc(vbo, stitch_preview->num_static_tris * 3);
-	for (int i = 0; i < stitch_preview->num_static_tris * 3; i++)
+	for (int i = 0; i < stitch_preview->num_static_tris * 3; i++) {
 		GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->static_tris[i * 2]);
+	}
 	stitch_draw_vbo(vbo, GWN_PRIM_TRIS, col);
 
 
@@ -1610,7 +1611,8 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
 
 		/* Closing line */
 		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index]);
-		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + j*2]); /* j = uvs_per_polygon[i] - 1*/
+		/* j = uvs_per_polygon[i] - 1*/
+		GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + j * 2]);
 
 		index += stitch_preview->uvs_per_polygon[i] * 2;
 	}
@@ -1629,30 +1631,34 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
 		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_STITCHABLE, col);
 		vbo = GWN_vertbuf_create_with_format(&format);
 		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_stitchable);
-		for (int i = 0; i < stitch_preview->num_stitchable; i++)
+		for (int i = 0; i < stitch_preview->num_stitchable; i++) {
 			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i * 2]);
+		}
 		stitch_draw_vbo(vbo, GWN_PRIM_POINTS, col);
 
 		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_UNSTITCHABLE, col);
 		vbo = GWN_vertbuf_create_with_format(&format);
 		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_unstitchable);
-		for (int i = 0; i < stitch_preview->num_unstitchable; i++)
+		for (int i = 0; i < stitch_preview->num_unstitchable; i++) {
 			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i * 2]);
+		}
 		stitch_draw_vbo(vbo, GWN_PRIM_POINTS, col);
 	}
 	else {
 		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_STITCHABLE, col);
 		vbo = GWN_vertbuf_create_with_format(&format);
 		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_stitchable * 2);
-		for (int i = 0; i < stitch_preview->num_stitchable * 2; i++)
+		for (int i = 0; i < stitch_preview->num_stitchable * 2; i++) {
 			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i * 2]);
+		}
 		stitch_draw_vbo(vbo, GWN_PRIM_LINES, col);
 
 		UI_GetThemeColor4fv(TH_STITCH_PREVIEW_UNSTITCHABLE, col);
 		vbo = GWN_vertbuf_create_with_format(&format);
 		GWN_vertbuf_data_alloc(vbo, stitch_preview->num_unstitchable * 2);
-		for (int i = 0; i < stitch_preview->num_unstitchable * 2; i++)
+		for (int i = 0; i < stitch_preview->num_unstitchable * 2; i++) {
 			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i * 2]);
+		}
 		stitch_draw_vbo(vbo, GWN_PRIM_LINES, col);
 	}
 }

source/blender/gpu/intern/gpu_draw.c

@@ -2425,7 +2425,8 @@ void gpuPushAttrib(eGPUAttribMask mask)
 	AttribStack.top++;
 }
 
-static void restore_mask(GLenum cap, const bool value) {
+static void restore_mask(GLenum cap, const bool value)
+{
 	if (value) {
 		glEnable(cap);
 	}

source/blender/gpu/intern/gpu_uniformbuffer.c

@@ -368,7 +368,8 @@ int GPU_uniformbuffer_bindpoint(GPUUniformBuffer *ubo)
 	return ubo->bindpoint;
 }
 
-void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_) {
+void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_)
+{
 	BLI_assert(ubo_->type == GPU_UBO_DYNAMIC);
 	GPUUniformBufferDynamic *ubo = (GPUUniformBufferDynamic *)ubo_;
 	ubo->flag |= GPU_UBO_FLAG_DIRTY;

source/blender/makesrna/intern/rna_depsgraph.c

@@ -42,7 +42,6 @@
 
 #include "BLI_iterator.h"
 #include "BKE_report.h"
-#include "DNA_object_types.h"
 
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_debug.h"

source/blender/makesrna/intern/rna_lightprobe.c

@@ -37,8 +37,6 @@
 
 #ifdef RNA_RUNTIME
 
-#include "DNA_object_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BKE_main.h"
@@ -47,7 +45,6 @@
 #include "DNA_object_types.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 static void rna_LightProbe_recalc(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {

source/blender/makesrna/intern/rna_scene.c

@@ -471,7 +471,6 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "BKE_node.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
-#include "BKE_idprop.h"
 #include "BKE_mesh.h"
 #include "BKE_sound.h"
 #include "BKE_screen.h"
@@ -480,9 +479,6 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "BKE_freestyle.h"
 #include "BKE_gpencil.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-
 #include "ED_info.h"
 #include "ED_node.h"
 #include "ED_view3d.h"
@@ -492,6 +488,7 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "ED_scene.h"
 
 #include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
 
 #ifdef WITH_FREESTYLE

source/blender/makesrna/intern/rna_wm_manipulator.c

@@ -41,7 +41,6 @@
 
 #include "rna_internal.h"
 
-#include "WM_api.h"
 #include "WM_types.h"
 
 #ifdef RNA_RUNTIME
@@ -53,7 +52,6 @@
 #include <assert.h>
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 #include "DNA_workspace_types.h"
 

source/blender/python/gawain/gwn_py_api.h

@@ -18,8 +18,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __GWN_PY_API__
+#ifndef __GWN_PY_API_H__
-#define __GWN_PY_API__
+#define __GWN_PY_API_H__
 
 /** \file blender/python/gawain/gwn_py_api.h
  *  \ingroup pygawain
@@ -27,4 +27,4 @@
 
 PyObject *BPyInit_gawain(void);
 
-#endif  /* __GWN_PY_API__ */
+#endif  /* __GWN_PY_API_H__ */