Cleanup: whitespace

27 files changed, 61 insertions, 55 deletions

diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 55337fa5ed0..e4f8b8790f6 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -76,9 +76,10 @@ struct Base *BKE_view_layer_base_find(struct ViewLayer *view_layer, struct Objec
 void BKE_view_layer_base_deselect_all(struct ViewLayer *view_layer);
 void BKE_view_layer_base_select(struct ViewLayer *view_layer, struct Base *selbase);
 
-void BKE_view_layer_copy_data(struct ViewLayer *view_layer_dst, struct ViewLayer *view_layer_src,
-                               struct SceneCollection* mc_dst, struct SceneCollection* mc_src,
-                               const int flag);
+void BKE_view_layer_copy_data(
+        struct ViewLayer *view_layer_dst, struct ViewLayer *view_layer_src,
+        struct SceneCollection *mc_dst, struct SceneCollection *mc_src,
+        const int flag);
 
 void BKE_layer_collection_free(struct ViewLayer *view_layer, struct LayerCollection *lc);
 
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 363dc53496f..84eb4ee2e33 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -142,7 +142,9 @@ ViewLayer *BKE_view_layer_add(Scene *scene, const char *name)
 	BLI_addtail(&scene->view_layers, view_layer);
 
 	/* unique name */
-	BLI_uniquename(&scene->view_layers, view_layer, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(view_layer->name));
+	BLI_uniquename(
+	        &scene->view_layers, view_layer, DATA_("ViewLayer"), '.',
+	        offsetof(ViewLayer, name), sizeof(view_layer->name));
 
 	return view_layer;
 }
@@ -325,7 +327,8 @@ void BKE_view_layer_base_select(struct ViewLayer *view_layer, Base *selbase)
 /* Copying functions for datablocks that use ViewLayer/SceneCollection */
 
 /* Find the equivalent SceneCollection in the new tree */
-static SceneCollection *scene_collection_from_new_tree(SceneCollection *sc_reference, SceneCollection *sc_dst, SceneCollection *sc_src)
+static SceneCollection *scene_collection_from_new_tree(
+        SceneCollection *sc_reference, SceneCollection *sc_dst, SceneCollection *sc_src)
 {
 	if (sc_src == sc_reference) {
 		return sc_dst;
@@ -387,8 +390,9 @@ static void layer_collections_recreate(
  * \param mc_dst Master Collection the destination ViewLayer links in.
  * \param flag  Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
  */
-void BKE_view_layer_copy_data(ViewLayer *view_layer_dst, ViewLayer *view_layer_src, SceneCollection* mc_dst, SceneCollection* mc_src,
-                               const int flag)
+void BKE_view_layer_copy_data(
+        ViewLayer *view_layer_dst, ViewLayer *view_layer_src, SceneCollection *mc_dst, SceneCollection *mc_src,
+        const int flag)
 {
 	IDPropertyTemplate val = {0};
 
@@ -761,7 +765,8 @@ bool BKE_layer_collection_move_into(const ID *owner_id, LayerCollection *lc_dst,
 		}
 	}
 
-	LayerCollection *lc_new = BLI_findptr(&lc_dst->layer_collections, lc_src->scene_collection, offsetof(LayerCollection, scene_collection));
+	LayerCollection *lc_new = BLI_findptr(
+	        &lc_dst->layer_collections, lc_src->scene_collection, offsetof(LayerCollection, scene_collection));
 	BLI_assert(lc_new);
 	layer_collection_swap(view_layer, &lc_dst->layer_collections, NULL, lc_new, lc_src);
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index b3d7e2affd3..c095236733f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2212,8 +2212,8 @@ Depsgraph *BKE_scene_get_depsgraph(Scene *scene,
 		Depsgraph **depsgraph_ptr;
 		if (!BLI_ghash_ensure_p_ex(scene->depsgraph_hash,
 		                           &key,
-		                           (void***)&key_ptr,
-		                           (void***)&depsgraph_ptr))
+		                           (void ***)&key_ptr,
+		                           (void ***)&depsgraph_ptr))
 		{
 			*key_ptr = MEM_mallocN(sizeof(DepsgraphKey), __func__);
 			**key_ptr = key;
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 93fe634fe52..8d56a1c8620 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -219,7 +219,7 @@ void do_versions_after_linking_280(Main *main)
 						if (base->lay & (1 << layer)) {
 							int collection_index = -1;
 							if ((base->object->restrictflag & OB_RESTRICT_VIEW) &&
-								(base->object->restrictflag & OB_RESTRICT_RENDER))
+							    (base->object->restrictflag & OB_RESTRICT_RENDER))
 							{
 								collection_index = DO_VERSION_COLLECTION_HIDE_ALL;
 							}
@@ -360,7 +360,7 @@ void do_versions_after_linking_280(Main *main)
 						/* Add new collection bases. */
 						for (int layer = 0; layer < 20; layer++) {
 							if ((scene->lay & srl->lay & ~(srl->lay_exclude) & (1 << layer)) ||
-								(srl->lay_zmask & (scene->lay | srl->lay_exclude) & (1 << layer)))
+							    (srl->lay_zmask & (scene->lay | srl->lay_exclude) & (1 << layer)))
 							{
 								if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) {
 
@@ -580,14 +580,14 @@ void do_versions_after_linking_280(Main *main)
 				SceneCollection *sc_hidden = NULL;
 
 				for (GroupObject *go = group->gobject.first; go; go = go->next) {
-					if (go->ob->lay & group->layer){
+					if (go->ob->lay & group->layer) {
 						BKE_collection_object_add(&group->id, sc, go->ob);
 					}
 					else {
 						if (sc_hidden == NULL) {
 							sc_hidden = BKE_collection_add(&group->id, sc, COLLECTION_TYPE_GROUP_INTERNAL, "Hidden");
 						}
-				        BKE_collection_object_add(&group->id, sc_hidden, go->ob);
+						BKE_collection_object_add(&group->id, sc_hidden, go->ob);
 					}
 				}
 
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 36ce277e4cf..dffbb88f708 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -4000,7 +4000,7 @@ static bool write_file_handle(
 						write_scene(wd, (Scene *)id);
 						break;
 					case ID_CU:
-						write_curve(wd,(Curve *)id);
+						write_curve(wd, (Curve *)id);
 						break;
 					case ID_MB:
 						write_mball(wd, (MetaBall *)id);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
index b34395e8a9a..79316e47022 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_nodes_layer_collection.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph's nodes
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index a8325d34a27..ed36c97273c 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_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_view_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph's nodes
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
index 0a8552ba747..452bd7b19e7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_relations_layer_collection.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 1f105ee0823..29cff0cb28d 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_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_view_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 235da01a619..97e38af4367 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -653,7 +653,7 @@ ID *deg_expand_copy_on_write_datablock(const Depsgraph *depsgraph,
 	switch (id_type) {
 		case ID_SCE:
 		{
-			done = scene_copy_inplace_no_main((Scene *)id_orig, (Scene*)id_cow);
+			done = scene_copy_inplace_no_main((Scene *)id_orig, (Scene *)id_cow);
 			break;
 		}
 		case ID_ME:
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 38f2aab4443..41564bb2703 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1295,7 +1295,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld
 				/* Do not render surface if we are rendering a volume object
 				 * and do not have a surface closure. */
 				if (use_volume_material &&
-					(gpumat_array[i] && !GPU_material_use_domain_surface(gpumat_array[i])))
+				    (gpumat_array[i] && !GPU_material_use_domain_surface(gpumat_array[i])))
 				{
 					continue;
 				}
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index 43aaec1b4ba..d5e0a05f9ed 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file eevee_effects.c
+/** \file eevee_motion_blur.c
  *  \ingroup draw_engine
  *
  * Gather all screen space effects technique such as Bloom, Motion Blur, DoF, SSAO, SSR, ...
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 72b8c85b7a7..5faac4c42cc 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -56,9 +56,9 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data
 	IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, COLLECTION_MODE_NONE, RE_engine_id_BLENDER_EEVEE);
 
 	if (BKE_collection_engine_property_value_get_int(props, "taa_samples") != 1 &&
-		/* FIXME the motion blur camera evaluation is tagging view_updated
-		 * thus making the TAA always reset and never stopping rendering. */
-		(effects->enabled_effects & EFFECT_MOTION_BLUR) == 0)
+	    /* FIXME the motion blur camera evaluation is tagging view_updated
+	     * thus making the TAA always reset and never stopping rendering. */
+	    (effects->enabled_effects & EFFECT_MOTION_BLUR) == 0)
 	{
 		const float *viewport_size = DRW_viewport_size_get();
 		float persmat[4][4], viewmat[4][4];
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 14383e28cc7..dfb88572cf8 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file eevee_volume.c
+/** \file eevee_volumes.c
  *  \ingroup draw_engine
  *
  * Volumetric effects rendering using frostbite approach.
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 436bcbaad9f..264fc079e42 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1449,7 +1449,7 @@ void DRW_pass_sort_shgroup_z(DRWPass *pass)
 		DRWShadingGroup *last = pass->shgroups;
 		while ((last = last->next)) {
 			/* Do nothing */
-		};
+		}
 		pass->shgroups_last = last;
 	}
 }
@@ -2044,8 +2044,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
 		}
 	}
 	else {
-		for (DRWCall *call = shgroup->calls_first; call; call = call->head.prev)
-		{
+		for (DRWCall *call = shgroup->calls_first; call; call = call->head.prev) {
 			bool neg_scale = is_negative_m4(call->obmat);
 
 			/* Negative scale objects */
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 066c4e5a692..8d2ff327c51 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -82,7 +82,7 @@ typedef enum eParentType {
 	PAR_VERTEX_TRI,
 } eParentType;
 
-typedef enum eObjectSelect_Mode{
+typedef enum eObjectSelect_Mode {
 	BA_DESELECT = 0,
 	BA_SELECT = 1,
 	BA_INVERT = 2,
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 1866cebcbb8..bbcd10270d5 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -502,7 +502,7 @@ static int override_type_set_button_exec(bContext *C, wmOperator *op)
 
 	short operation;
 
-	switch(op_type) {
+	switch (op_type) {
 		case UIOverride_Type_NOOP:
 			operation = IDOVERRIDESTATIC_OP_NOOP;
 			break;
diff --git a/source/blender/editors/mesh/editmesh_polybuild.c b/source/blender/editors/mesh/editmesh_polybuild.c
index bfabd64396f..f398f087da9 100644
--- a/source/blender/editors/mesh/editmesh_polybuild.c
+++ b/source/blender/editors/mesh/editmesh_polybuild.c
@@ -132,7 +132,7 @@ static int edbm_polybuild_face_at_cursor_invoke(
 				BMEdge *e_iter = v_act->e;
 				do {
 					if ((BM_elem_flag_test(e_iter, BM_ELEM_HIDDEN) == false) &&
-						(allow_wire ? BM_edge_is_wire(e_iter) : BM_edge_is_boundary(e_iter)))
+					    (allow_wire ? BM_edge_is_wire(e_iter) : BM_edge_is_boundary(e_iter)))
 					{
 						if (i == 2) {
 							e_pair[0] = e_pair[1] = NULL;
@@ -489,9 +489,9 @@ static int edbm_polybuild_hover_invoke(
 		/* pass */
 	}
 	else if (vc.win->tweak ||
-	    (vc.win->eventstate->check_click &&
-	     vc.win->eventstate->prevval == KM_PRESS &&
-	     ISMOUSE(vc.win->eventstate->prevtype)))
+	         (vc.win->eventstate->check_click &&
+	          vc.win->eventstate->prevval == KM_PRESS &&
+	          ISMOUSE(vc.win->eventstate->prevtype)))
 	{
 		return OPERATOR_PASS_THROUGH;
 	}
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 2c659d2b985..4e75ca3e6f1 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -832,7 +832,7 @@ static void clean_viewport_memory(Main *bmain, Scene *scene)
 		}
 	}
 
-    for (SETLOOPER_SET_ONLY(scene, sce_iter, base)) {
+	for (SETLOOPER_SET_ONLY(scene, sce_iter, base)) {
 		clean_viewport_memory_base(base);
 	}
 }
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index 4ac5ad6e8d2..670fc4e6627 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -619,9 +619,9 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar
 
 				if (collection->scene_collection->type == COLLECTION_TYPE_NONE) {
 					bt = uiDefIconButBitS(block, UI_BTYPE_ICON_TOGGLE_N, COLLECTION_SELECTABLE, 0, ICON_RESTRICT_SELECT_OFF,
-										  (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, UI_UNIT_X,
-										  UI_UNIT_Y, &collection->flag, 0, 0, 0, 0,
-										  TIP_("Restrict/Allow 3D View selection of objects in the collection"));
+					                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, UI_UNIT_X,
+					                      UI_UNIT_Y, &collection->flag, 0, 0, 0, 0,
+					                      TIP_("Restrict/Allow 3D View selection of objects in the collection"));
 					UI_but_func_set(bt, restrictbutton_collection_flag_cb, scene, collection);
 					UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
 				}
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index ffaa259ab6f..1bc1a227a03 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -125,7 +125,8 @@ static int outliner_parent_drop_poll(bContext *C, wmDrag *drag, const wmEvent *e
 				 */
 				if (!scene) {
 					return 1;
-				} else {
+				}
+				else {
 					for (ViewLayer *view_layer = scene->view_layers.first;
 					     view_layer;
 					     view_layer = view_layer->next)
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index ee722397f91..3d9ab560bc7 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1500,7 +1500,7 @@ static void WIDGETGROUP_xform_cage_setup(const bContext *UNUSED(C), wmManipulato
 	             ED_MANIPULATOR_CAGE2D_XFORM_FLAG_TRANSLATE);
 
 	mpr->color[0] = 1;
-	mpr->color_hi[0]=1;
+	mpr->color_hi[0] =1;
 
 	mgroup->customdata = xmgroup;
 
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 231f1d8f7b1..57df877bf18 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -181,7 +181,8 @@ void gpu_extensions_init(void)
 	/* XXX : TODO : Remove this once this sampling mipmap problem is gone.
 	 * https://github.com/dfelinto/opengl-sandbox/blob/downsample/README.md */
 	else if (strstr(renderer, "AMD VEGA") &&
-	         strstr(vendor, "X.Org")) {
+	         strstr(vendor, "X.Org"))
+	{
 		GG.device = GPU_DEVICE_AMD_VEGA;
 		GG.driver = GPU_DRIVER_OPENSOURCE;
 	}
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 0a8ef9dffc5..e2883b53047 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -516,9 +516,9 @@ static float gaussian_profile(float r, float radius)
 	const float v = radius * radius * (0.25f * 0.25f);
 	const float Rm = sqrtf(v * GAUSS_TRUNCATE);
 
-	if(r >= Rm)
+	if (r >= Rm) {
 		return 0.0f;
-
+	}
 	return expf(-r * r / (2.0f * v)) / (2.0f * M_PI * v);
 }
 
@@ -535,20 +535,20 @@ static float cubic_profile(float r, float radius, float sharpness)
 {
 	float Rm = radius * (1.0f + sharpness);
 
-	if(r >= Rm)
+	if (r >= Rm) {
 		return 0.0f;
-
+	}
 	/* custom variation with extra sharpness, to match the previous code */
-	const float y = 1.0f/(1.0f + sharpness);
+	const float y = 1.0f / (1.0f + sharpness);
 	float Rmy, ry, ryinv;
 
 	Rmy = powf(Rm, y);
 	ry = powf(r, y);
-	ryinv = (r > 0.0f)? powf(r, y - 1.0f): 0.0f;
+	ryinv = (r > 0.0f) ? powf(r, y - 1.0f) : 0.0f;
 
-	const float Rmy5 = (Rmy*Rmy) * (Rmy*Rmy) * Rmy;
+	const float Rmy5 = (Rmy * Rmy) * (Rmy * Rmy) * Rmy;
 	const float f = Rmy - ry;
-	const float num = f*(f*f)*(y*ryinv);
+	const float num = f * (f * f) * (y * ryinv);
 
 	return (10.0f * num) / (Rmy5 * M_PI);
 }
@@ -576,7 +576,7 @@ static float eval_integral(float x0, float x1, short falloff_type, float sharpne
 	const float step = range / INTEGRAL_RESOLUTION;
 	float integral = 0.0f;
 
-	for(int i = 0; i < INTEGRAL_RESOLUTION; ++i) {
+	for (int i = 0; i < INTEGRAL_RESOLUTION; ++i) {
 		float x = x0 + range * ((float)i + 0.5f) / (float)INTEGRAL_RESOLUTION;
 		float y = eval_profile(x, falloff_type, sharpness, param);
 		integral += y * step;
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 0b623bc9003..44e2d4b3144 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -7319,8 +7319,7 @@ void RNA_property_override_apply(
         PointerRNA *dst, PointerRNA *src, PointerRNA *storage, PropertyRNA *prop, IDOverrideStaticProperty *op)
 {
 	for (IDOverrideStaticPropertyOperation *opop = op->operations.first; opop; opop = opop->next) {
-		if (!rna_property_override_operation_apply(dst, src, storage, prop, opop))
-		{
+		if (!rna_property_override_operation_apply(dst, src, storage, prop, opop)) {
 			BLI_assert(0);
 		}
 	}
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 19053c2a44e..a153590f4ac 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -57,7 +57,6 @@
 
 #include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.h */
 #include "ED_mesh.h"
-#include "ED_object.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 4e090b0b19f..78bab14cd96 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -231,7 +231,8 @@ int main(
 
 	/* --- end declarations --- */
 
-	/* ensure we free data on early-exit */	struct CreatorAtExitData app_init_data = {NULL};
+	/* ensure we free data on early-exit */
+	struct CreatorAtExitData app_init_data = {NULL};
 	BKE_blender_atexit_register(callback_main_atexit, &app_init_data);
 
 #ifdef WIN32