Cleanup: style, whitespace, doxy filepaths

44 files changed, 163 insertions, 160 deletions

diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index dff696863e9..7d3d12ac112 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -340,11 +340,11 @@ static void motionpaths_calc_update_scene(Scene *scene)
 		}
 	}
 #else // original, 'always correct' version
-	  /* do all updates
-	   *  - if this is too slow, resort to using a more efficient way
-	   *    that doesn't force complete update, but for now, this is the
-	   *    most accurate way!
-	   */
+	/* do all updates
+	 *  - if this is too slow, resort to using a more efficient way
+	 *    that doesn't force complete update, but for now, this is the
+	 *    most accurate way!
+	 */
 	BKE_scene_update_for_newframe(G.main->eval_ctx, G.main, scene, scene->lay); /* XXX this is the best way we can get anything moving */
 #endif
 }
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 2d531e32f69..cc495b3da7a 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1826,14 +1826,14 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
 						DynamicPaintModifierApplyData data = {.surface = surface, .fcolor = fcolor};
 						BLI_task_parallel_range(0, sData->total_points, &data,
 						                        dynamic_paint_apply_surface_vpaint_blend_cb,
-												sData->total_points > 1000);
+						                        sData->total_points > 1000);
 
 						/* paint layer */
 						MLoopCol *mloopcol = CustomData_get_layer_named(&result->loopData, CD_MLOOPCOL, surface->output_name);
 						/* if output layer is lost from a constructive modifier, re-add it */
 						if (!mloopcol && dynamicPaint_outputLayerExists(surface, ob, 0)) {
 							mloopcol = CustomData_add_layer_named(
-									  &result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name);
+							        &result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name);
 						}
 
 						/* wet layer */
@@ -1841,7 +1841,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
 						/* if output layer is lost from a constructive modifier, re-add it */
 						if (!mloopcol_wet && dynamicPaint_outputLayerExists(surface, ob, 1)) {
 							mloopcol_wet = CustomData_add_layer_named(
-										  &result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name2);
+							        &result->loopData, CD_MLOOPCOL, CD_CALLOC, NULL, totloop, surface->output_name2);
 						}
 
 						/* Save preview results to weight layer to be able to share same drawing methods */
@@ -1850,7 +1850,7 @@ static DerivedMesh *dynamicPaint_Modifier_apply(
 							mloopcol_preview = CustomData_get_layer(&result->loopData, CD_PREVIEW_MLOOPCOL);
 							if (!mloopcol_preview) {
 								mloopcol_preview = CustomData_add_layer(
-												  &result->loopData, CD_PREVIEW_MLOOPCOL, CD_CALLOC, NULL, totloop);
+								        &result->loopData, CD_PREVIEW_MLOOPCOL, CD_CALLOC, NULL, totloop);
 							}
 						}
 
@@ -2367,15 +2367,15 @@ static int dynamic_paint_find_neighbour_pixel(
 		edge1_index = 0;
 		edge2_index = 1;
 		dist_squared = dist_squared_to_line_segment_v2(
-						   pixel,
-						   mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv,
-						   mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv);
+		        pixel,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv);
 
 		/* Dist to second edge */
 		t_dist_squared = dist_squared_to_line_segment_v2(
-							 pixel,
-							 mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv,
-							 mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv);
+		        pixel,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[1]].uv,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv);
 		if (t_dist_squared < dist_squared) {
 			e1_index = cPoint->v2;
 			e2_index = cPoint->v3;
@@ -2386,9 +2386,9 @@ static int dynamic_paint_find_neighbour_pixel(
 
 		/* Dist to third edge */
 		t_dist_squared = dist_squared_to_line_segment_v2(
-							 pixel,
-							 mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv,
-							 mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv);
+		        pixel,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[2]].uv,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[0]].uv);
 		if (t_dist_squared < dist_squared) {
 			e1_index = cPoint->v3;
 			e2_index = cPoint->v1;
@@ -2439,9 +2439,9 @@ static int dynamic_paint_find_neighbour_pixel(
 		//printf("connected UV : %f,%f & %f,%f - %f,%f & %f,%f\n", s_uv1[0], s_uv1[1], s_uv2[0], s_uv2[1], t_uv1[0], t_uv1[1], t_uv2[0], t_uv2[1]);
 
 		if (((s_uv1[0] == t_uv1[0] && s_uv1[1] == t_uv1[1]) &&
-			 (s_uv2[0] == t_uv2[0] && s_uv2[1] == t_uv2[1])) ||
-			((s_uv2[0] == t_uv1[0] && s_uv2[1] == t_uv1[1]) &&
-			 (s_uv1[0] == t_uv2[0] && s_uv1[1] == t_uv2[1])))
+		     (s_uv2[0] == t_uv2[0] && s_uv2[1] == t_uv2[1])) ||
+		    ((s_uv2[0] == t_uv1[0] && s_uv2[1] == t_uv1[1]) &&
+		     (s_uv1[0] == t_uv2[0] && s_uv1[1] == t_uv2[1])))
 		{
 			return ((px + neighX[n_index]) + w * (py + neighY[n_index]));
 		}
@@ -2451,15 +2451,15 @@ static int dynamic_paint_find_neighbour_pixel(
 		 *	on this other face UV
 		 */
 		lambda = closest_to_line_v2(
-					 closest_point, pixel,
-					 mloopuv[mlooptri[cPoint->tri_index].tri[edge1_index]].uv,
-					 mloopuv[mlooptri[cPoint->tri_index].tri[edge2_index]].uv);
+		        closest_point, pixel,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[edge1_index]].uv,
+		        mloopuv[mlooptri[cPoint->tri_index].tri[edge2_index]].uv);
 		CLAMP(lambda, 0.0f, 1.0f);
 
 		sub_v2_v2v2(
-				dir_vec,
-				mloopuv[mlooptri[target_tri].tri[target_uv2]].uv,
-				mloopuv[mlooptri[target_tri].tri[target_uv1]].uv);
+		        dir_vec,
+		        mloopuv[mlooptri[target_tri].tri[target_uv2]].uv,
+		        mloopuv[mlooptri[target_tri].tri[target_uv1]].uv);
 
 		mul_v2_fl(dir_vec, lambda);
 
@@ -2678,8 +2678,8 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface, flo
 		ImgSeqFormatData *f_data = MEM_callocN(sizeof(*f_data), "ImgSeqFormatData");
 		if (f_data) {
 			f_data->uv_p = MEM_callocN(active_points * sizeof(*f_data->uv_p), "PaintUVPoint");
-			f_data->barycentricWeights = MEM_callocN(active_points * aa_samples * sizeof(*f_data->barycentricWeights),
-													 "PaintUVPoint");
+			f_data->barycentricWeights =
+			        MEM_callocN(active_points * aa_samples * sizeof(*f_data->barycentricWeights), "PaintUVPoint");
 
 			if (!f_data->uv_p || !f_data->barycentricWeights)
 				error = 1;
@@ -2881,7 +2881,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface, char *filenam
 	}
 
 	DynamicPaintOutputSurfaceImageData data = {.surface = surface, .ibuf = ibuf};
-	switch(surface->type) {
+	switch (surface->type) {
 		case MOD_DPAINT_SURFACE_T_PAINT:
 			switch (output_layer) {
 				case 0:
@@ -3883,12 +3883,12 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface,
 
 					/* loop through cell points and process brush */
 					DynamicPaintPaintData data = {
-						.surface = surface,
+					    .surface = surface,
 					    .brush = brush, .brushOb = brushOb, .bMats = bMats,
 					    .scene = scene, .timescale = timescale, .c_index = c_index,
-						.dm = dm, .mvert = mvert, .mloop = mloop, .mlooptri = mlooptri,
-						.brush_radius = brush_radius, .avg_brushNor = avg_brushNor, .brushVelocity = brushVelocity,
-						.treeData = &treeData
+					    .dm = dm, .mvert = mvert, .mloop = mloop, .mlooptri = mlooptri,
+					    .brush_radius = brush_radius, .avg_brushNor = avg_brushNor, .brushVelocity = brushVelocity,
+					    .treeData = &treeData
 					};
 					BLI_task_parallel_range_ex(0, grid->s_num[c_index], &data, NULL, 0,
 					                           dynamic_paint_paint_mesh_cell_point_cb_ex,
@@ -4170,10 +4170,10 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
 
 			/* loop through cell points */
 			DynamicPaintPaintData data = {
-				.surface = surface,
+			    .surface = surface,
 			    .brush = brush, .psys = psys,
 			    .solidradius = solidradius, .timescale = timescale, .c_index = c_index,
-				.treeData = tree,
+			    .treeData = tree,
 			};
 			BLI_task_parallel_range_ex(0, grid->s_num[c_index], &data, NULL, 0,
 			                           dynamic_paint_paint_particle_cell_point_cb_ex,
@@ -4313,16 +4313,16 @@ static int dynamicPaint_paintSinglePoint(
 	 *	Loop through every surface point
 	 */
 	DynamicPaintPaintData data = {
-		.surface = surface,
-		.brush = brush, .brushOb = brushOb, .bMats = bMats,
-		.scene = scene, .timescale = timescale,
-		.mvert = mvert,
-		.brush_radius = brush_radius, .brushVelocity = &brushVel,
+	    .surface = surface,
+	    .brush = brush, .brushOb = brushOb, .bMats = bMats,
+	    .scene = scene, .timescale = timescale,
+	    .mvert = mvert,
+	    .brush_radius = brush_radius, .brushVelocity = &brushVel,
 	    .pointCoord = pointCoord,
 	};
 	BLI_task_parallel_range_ex(0, sData->total_points, &data, NULL, 0,
-							   dynamic_paint_paint_single_point_cb_ex,
-							   sData->total_points > 1000, true);
+	                           dynamic_paint_paint_single_point_cb_ex,
+	                           sData->total_points > 1000, true);
 
 	return 1;
 }
@@ -4755,83 +4755,83 @@ static void dynamic_paint_effect_drip_cb(void *userdata, const int index)
 {
 	const DynamicPaintEffectData *data = userdata;
 
-    const DynamicPaintSurface *surface = data->surface;
-    const PaintSurfaceData *sData = surface->data;
-    BakeAdjPoint *bNeighs = sData->bData->bNeighs;
-    PaintPoint *pPoint = &((PaintPoint *)sData->type_data)[index];
-    const PaintPoint *prevPoint = data->prevPoint;
-    const PaintPoint *pPoint_prev = &prevPoint[index];
-    const float *force = data->force;
-    const float eff_scale = data->eff_scale;
+	const DynamicPaintSurface *surface = data->surface;
+	const PaintSurfaceData *sData = surface->data;
+	BakeAdjPoint *bNeighs = sData->bData->bNeighs;
+	PaintPoint *pPoint = &((PaintPoint *)sData->type_data)[index];
+	const PaintPoint *prevPoint = data->prevPoint;
+	const PaintPoint *pPoint_prev = &prevPoint[index];
+	const float *force = data->force;
+	const float eff_scale = data->eff_scale;
 
-    const int *n_target = sData->adj_data->n_target;
+	const int *n_target = sData->adj_data->n_target;
 
-    uint8_t *point_locks = data->point_locks;
+	uint8_t *point_locks = data->point_locks;
 
-    int closest_id[2];
-    float closest_d[2];
+	int closest_id[2];
+	float closest_d[2];
 
-    /* adjust drip speed depending on wetness */
-    float w_factor = pPoint_prev->wetness - 0.025f;
-    if (w_factor <= 0)
-	    return;
-    CLAMP(w_factor, 0.0f, 1.0f);
+	/* adjust drip speed depending on wetness */
+	float w_factor = pPoint_prev->wetness - 0.025f;
+	if (w_factor <= 0)
+		return;
+	CLAMP(w_factor, 0.0f, 1.0f);
 
-    /* get force affect points */
-    surface_determineForceTargetPoints(sData, index, &force[index * 4], closest_d, closest_id);
+	/* get force affect points */
+	surface_determineForceTargetPoints(sData, index, &force[index * 4], closest_d, closest_id);
 
-    /* Apply movement towards those two points */
-    for (int i = 0; i < 2; i++) {
-	    const int n_idx = closest_id[i];
-	    if (n_idx != -1 && closest_d[i] > 0.0f) {
-		    const float dir_dot = closest_d[i];
+	/* Apply movement towards those two points */
+	for (int i = 0; i < 2; i++) {
+		const int n_idx = closest_id[i];
+		if (n_idx != -1 && closest_d[i] > 0.0f) {
+			const float dir_dot = closest_d[i];
 
-		    /* just skip if angle is too extreme */
-		    if (dir_dot <= 0.0f)
-			    continue;
+			/* just skip if angle is too extreme */
+			if (dir_dot <= 0.0f)
+				continue;
 
-		    float dir_factor, a_factor;
-		    const float speed_scale = eff_scale * force[index * 4 + 3] / bNeighs[n_idx].dist;
+			float dir_factor, a_factor;
+			const float speed_scale = eff_scale * force[index * 4 + 3] / bNeighs[n_idx].dist;
 
-		    const unsigned int n_trgt = (unsigned int)n_target[n_idx];
+			const unsigned int n_trgt = (unsigned int)n_target[n_idx];
 
-		    /* Sort of spinlock, but only for given ePoint.
-		     * Since the odds a same ePoint is modified at the same time by several threads is very low, this is
-		     * much more eficient than a global spin lock. */
-		    const unsigned int pointlock_idx = n_trgt / 8;
-		    const uint8_t pointlock_bitmask = 1 << (n_trgt & 7);  /* 7 == 0b111 */
-		    while (atomic_fetch_and_or_uint8(&point_locks[pointlock_idx], pointlock_bitmask) & pointlock_bitmask);
+			/* Sort of spinlock, but only for given ePoint.
+			 * Since the odds a same ePoint is modified at the same time by several threads is very low, this is
+			 * much more eficient than a global spin lock. */
+			const unsigned int pointlock_idx = n_trgt / 8;
+			const uint8_t pointlock_bitmask = 1 << (n_trgt & 7);  /* 7 == 0b111 */
+			while (atomic_fetch_and_or_uint8(&point_locks[pointlock_idx], pointlock_bitmask) & pointlock_bitmask);
 
-		    PaintPoint *ePoint = &((PaintPoint *)sData->type_data)[n_trgt];
-		    const float e_wet = ePoint->wetness;
+			PaintPoint *ePoint = &((PaintPoint *)sData->type_data)[n_trgt];
+			const float e_wet = ePoint->wetness;
 
-		    dir_factor = min_ff(0.5f, dir_dot * min_ff(speed_scale, 1.0f) * w_factor);
+			dir_factor = min_ff(0.5f, dir_dot * min_ff(speed_scale, 1.0f) * w_factor);
 
-		    /* mix new wetness */
-		    ePoint->wetness += dir_factor;
-		    CLAMP(ePoint->wetness, 0.0f, MAX_WETNESS);
+			/* mix new wetness */
+			ePoint->wetness += dir_factor;
+			CLAMP(ePoint->wetness, 0.0f, MAX_WETNESS);
 
-		    /* mix new color */
-		    a_factor = dir_factor / pPoint_prev->wetness;
-		    CLAMP(a_factor, 0.0f, 1.0f);
-		    mixColors(ePoint->e_color, ePoint->e_color[3], pPoint_prev->e_color, pPoint_prev->e_color[3], a_factor);
-		    /* dripping is supposed to preserve alpha level */
-		    if (pPoint_prev->e_color[3] > ePoint->e_color[3]) {
-			    ePoint->e_color[3] += a_factor * pPoint_prev->e_color[3];
-			    CLAMP_MAX(ePoint->e_color[3], pPoint_prev->e_color[3]);
-		    }
+			/* mix new color */
+			a_factor = dir_factor / pPoint_prev->wetness;
+			CLAMP(a_factor, 0.0f, 1.0f);
+			mixColors(ePoint->e_color, ePoint->e_color[3], pPoint_prev->e_color, pPoint_prev->e_color[3], a_factor);
+			/* dripping is supposed to preserve alpha level */
+			if (pPoint_prev->e_color[3] > ePoint->e_color[3]) {
+				ePoint->e_color[3] += a_factor * pPoint_prev->e_color[3];
+				CLAMP_MAX(ePoint->e_color[3], pPoint_prev->e_color[3]);
+			}
 
-		    /* decrease paint wetness on current point */
-		    pPoint->wetness -= (ePoint->wetness - e_wet);
-		    CLAMP(pPoint->wetness, 0.0f, MAX_WETNESS);
+			/* decrease paint wetness on current point */
+			pPoint->wetness -= (ePoint->wetness - e_wet);
+			CLAMP(pPoint->wetness, 0.0f, MAX_WETNESS);
 
 #ifndef NDEBUG
 			uint8_t ret = atomic_fetch_and_and_uint8(&point_locks[pointlock_idx], ~pointlock_bitmask);
-	        BLI_assert(ret & pointlock_bitmask);
+			BLI_assert(ret & pointlock_bitmask);
 #else
 			atomic_fetch_and_and_uint8(&point_locks[pointlock_idx], ~pointlock_bitmask);
 #endif
-	    }
+		}
 	}
 }
 
@@ -4892,7 +4892,7 @@ static void dynamicPaint_doEffectStep(
 		memcpy(prevPoint, sData->type_data, sData->total_points * sizeof(struct PaintPoint));
 
 		DynamicPaintEffectData data = {
-			.surface = surface, .prevPoint = prevPoint,
+		    .surface = surface, .prevPoint = prevPoint,
 		    .eff_scale = eff_scale, .force = force,
 		    .point_locks = point_locks,
 		};
@@ -5108,7 +5108,7 @@ static void dynamic_paint_surface_pre_step_cb(void *userdata, const int index)
 					if (pPoint->color[3]) {
 						for (i = 0; i < 3; i++) {
 							pPoint->color[i] = (f_color[i] * f_color[3] - pPoint->e_color[i] * pPoint->e_color[3]) /
-											   (pPoint->color[3] * (1.0f - pPoint->e_color[3]));
+							                   (pPoint->color[3] * (1.0f - pPoint->e_color[3]));
 						}
 					}
 				}
@@ -5129,17 +5129,17 @@ static void dynamic_paint_surface_pre_step_cb(void *userdata, const int index)
 
 		if (surface->flags & MOD_DPAINT_DISSOLVE) {
 			value_dissolve(&pPoint->color[3], surface->diss_speed, timescale,
-						   (surface->flags & MOD_DPAINT_DISSOLVE_LOG) != 0);
+			               (surface->flags & MOD_DPAINT_DISSOLVE_LOG) != 0);
 			CLAMP_MIN(pPoint->color[3], 0.0f);
 
 			value_dissolve(&pPoint->e_color[3], surface->diss_speed, timescale,
-						   (surface->flags & MOD_DPAINT_DISSOLVE_LOG) != 0);
+			               (surface->flags & MOD_DPAINT_DISSOLVE_LOG) != 0);
 			CLAMP_MIN(pPoint->e_color[3], 0.0f);
 		}
 	}
 	/* dissolve for float types */
 	else if (surface->flags & MOD_DPAINT_DISSOLVE &&
-			 (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE || surface->type == MOD_DPAINT_SURFACE_T_WEIGHT))
+	         (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE || surface->type == MOD_DPAINT_SURFACE_T_WEIGHT))
 	{
 		float *point = &((float *)sData->type_data)[index];
 		/* log or linear */
@@ -5388,7 +5388,7 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const Sce
 	 */
 	DynamicPaintGenerateBakeData data = {
 	    .surface = surface, .ob = ob,
-		.mvert = mvert, .canvas_verts = canvas_verts,
+	    .mvert = mvert, .canvas_verts = canvas_verts,
 	    .do_velocity_data = do_velocity_data, .new_bdata = new_bdata,
 	};
 	BLI_task_parallel_range(
diff --git a/source/blender/blenkernel/intern/library_idmap.c b/source/blender/blenkernel/intern/library_idmap.c
index 66025c04332..daf097b9f0b 100644
--- a/source/blender/blenkernel/intern/library_idmap.c
+++ b/source/blender/blenkernel/intern/library_idmap.c
@@ -33,7 +33,7 @@
 #include "BKE_library.h"
 #include "BKE_library_idmap.h"  /* own include */
 
-/** \file blender/blenkernel/intern/library_map.c
+/** \file blender/blenkernel/intern/library_idmap.c
  *  \ingroup bke
  *
  * Utility functions for faster ID lookups.
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index fa0367d1656..2b381f6ff0b 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -2418,7 +2418,8 @@ void ntreeInterfaceTypeUpdate(bNodeTree *ntree)
 
 /* ************ find stuff *************** */
 
-bNode *ntreeFindType(const bNodeTree *ntree, int type) {
+bNode *ntreeFindType(const bNodeTree *ntree, int type)
+{
 	if (ntree) {
 		for (bNode * node = ntree->nodes.first; node; node = node->next) {
 			if (node->type == type) {
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 1ca68f714c8..4fa80723df8 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -230,7 +230,7 @@ static void realloc_particles(ParticleSimulationData *sim, int new_totpart)
 				newboids= MEM_callocN(totpart*sizeof(BoidParticle), "boid particles");
 
 				if (newboids == NULL) {
-					 /* allocation error! */
+					/* allocation error! */
 					if (newpars)
 						MEM_freeN(newpars);
 					return;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index f0ba63e35b4..7b8f4986325 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -2501,7 +2501,7 @@ static int ptcache_read_openvdb_stream(PTCacheID *pid, int cfra)
 #ifdef WITH_OPENVDB
 	char filename[FILE_MAX * 2];
 
-	 /* save blend file before using disk pointcache */
+	/* save blend file before using disk pointcache */
 	if (!G.relbase_valid && (pid->cache->flag & PTCACHE_EXTERNAL) == 0)
 		return 0;
 
diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c
index 5d485e2033d..9c91da4abee 100644
--- a/source/blender/blenlib/intern/array_utils.c
+++ b/source/blender/blenlib/intern/array_utils.c
@@ -183,7 +183,7 @@ void _bli_array_binary_or(
  * \param user_data: User data for \a test_fn.
  * \param span_step: Indices to iterate over,
  * initialize both values to the array length to initialize iteration.
- * \param: r_span_len: The length of the span, useful when \a use_wrap is enabled,
+ * \param r_span_len: The length of the span, useful when \a use_wrap is enabled,
  * where calculating the length isnt a simple subtraction.
  */
 bool _bli_array_iter_span(
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index aba7c9d5ee2..3edc00a8c1a 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -389,7 +389,7 @@ LinkNode *BLI_file_read_as_lines(const char *name)
 		/*
 		 * size = because on win32 reading
 		 * all the bytes in the file will return
-		 * less bytes because of crnl changes.
+		 * less bytes because of `CRNL` changes.
 		 */
 		size = fread(buf, 1, size, fp);
 		for (i = 0; i <= size; i++) {
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c
index 58475b7f835..0b299af88aa 100644
--- a/source/blender/blenlib/intern/task.c
+++ b/source/blender/blenlib/intern/task.c
@@ -928,7 +928,7 @@ static void task_parallel_range_ex(
 				func_finalize(userdata, userdata_chunk_local);
 			}
 		}
-        MALLOCA_FREE(userdata_chunk_array, userdata_chunk_size * num_tasks);
+		MALLOCA_FREE(userdata_chunk_array, userdata_chunk_size * num_tasks);
 	}
 }
 
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index 6085b66a8b8..6ff6de33d56 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -172,8 +172,7 @@ void UVDataWrapper::getUV(int uv_index, float *uv)
 	}
 }
 
-VCOLDataWrapper::VCOLDataWrapper(COLLADAFW::MeshVertexData& vdata) : mVData(&vdata){
-}
+VCOLDataWrapper::VCOLDataWrapper(COLLADAFW::MeshVertexData& vdata) : mVData(&vdata) {}
 
 void VCOLDataWrapper::get_vcol(int v_index, MLoopCol *mloopcol)
 {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 9f80c21a6a4..6169100d574 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/build/deg_builder.cc
+/** \file blender/depsgraph/intern/builder/deg_builder.cc
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index 7ecb4b20684..bdc030e3810 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/build/deg_builder.h
+/** \file blender/depsgraph/intern/builder/deg_builder.h
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 18cfdb3593a..74a5be997f1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_build_nodes.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_nodes.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph's nodes
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
index 0e78df52ff8..f870a33fb68 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_pchanmap.h
+/** \file blender/depsgraph/intern/builder/deg_builder_pchanmap.cc
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index d333f1e80e2..cd706c87ae0 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1316,7 +1316,8 @@ void DepsgraphRelationBuilder::build_ik_pose(Object *ob,
 
 			OperationKey done_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_DONE);
 			add_relation(solver_key, done_key, DEPSREL_TYPE_TRANSFORM, "IK Chain Result");
-		} else {
+		}
+		else {
 			OperationKey final_transforms_key(&ob->id, DEPSNODE_TYPE_BONE, parchan->name, DEG_OPCODE_BONE_DONE);
 			add_relation(solver_key, final_transforms_key, DEPSREL_TYPE_TRANSFORM, "IK Solver Result");
 		}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index c0bf82becda..ce6d2c961fd 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -42,7 +42,6 @@
 #include "BLI_utildefines.h"
 #include "BLI_string.h"
 
-#include "intern/depsgraph_types.h"
 #include "intern/nodes/deg_node.h"
 #include "intern/nodes/deg_node_operation.h"
 
@@ -292,7 +291,8 @@ struct DepsNodeHandle
 /* Utilities for Builders ----------------------------------------------------- */
 
 template <typename KeyType>
-OperationDepsNode *DepsgraphRelationBuilder::find_operation_node(const KeyType& key) {
+OperationDepsNode *DepsgraphRelationBuilder::find_operation_node(const KeyType& key)
+{
 	DepsNode *node = find_node(key);
 	return node != NULL ? node->get_exit_operation() : NULL;
 }
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
index 0322ef7fa1d..76cd81f1b8f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
@@ -99,7 +99,7 @@ void deg_graph_transitive_reduction(Depsgraph *graph)
 		/* Remove redundant paths to the target. */
 		for (DepsNode::Relations::const_iterator it_rel = target->inlinks.begin();
 		     it_rel != target->inlinks.end();
-		    )
+		     )
 		{
 			DepsRelation *rel = *it_rel;
 			/* Increment in advance, so we can safely remove the relation. */
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index 97208939e57..4ce91516c84 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -136,13 +136,15 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
 	return "UNKNOWN";
 }
 
-DepsOperationStringifier::DepsOperationStringifier() {
+DepsOperationStringifier::DepsOperationStringifier()
+{
 	for (int i = 0; i < DEG_NUM_OPCODES; ++i) {
 		names_[i] = stringify_opcode((eDepsOperation_Code)i);
 	}
 }
 
-const char *DepsOperationStringifier::operator[](eDepsOperation_Code opcode) {
+const char *DepsOperationStringifier::operator[](eDepsOperation_Code opcode)
+{
 	BLI_assert((opcode > 0) && (opcode < DEG_NUM_OPCODES));
 	if (opcode >= 0 && opcode < DEG_NUM_OPCODES) {
 		return names_[opcode];
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 198cd349002..3024d625846 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsgraph_eval.cc
+/** \file blender/depsgraph/intern/eval/deg_eval.cc
  *  \ingroup depsgraph
  *
  * Evaluation engine entrypoints for Depsgraph Engine.
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.h b/source/blender/depsgraph/intern/eval/deg_eval.h
index 0d42f63433f..92f87b03803 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/eval/deg_eval.cc
+/** \file blender/depsgraph/intern/eval/deg_eval.h
  *  \ingroup depsgraph
  *
  * Evaluation engine entrypoints for Depsgraph Engine.
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index fda665b0db4..9ba0b61a4f1 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsgraph_tag.cc
+/** \file blender/depsgraph/intern/eval/deg_eval_flush.cc
  *  \ingroup depsgraph
  *
  * Core routines for how the Depsgraph works.
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.h b/source/blender/depsgraph/intern/eval/deg_eval_flush.h
index 8912aebee7d..ecd3a5ec660 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/eval/deg_eval_flush.cc
+/** \file blender/depsgraph/intern/eval/deg_eval_flush.h
  *  \ingroup depsgraph
  *
  * Core routines for how the Depsgraph works.
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 78293f7f483..12d5ee00a63 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsnode.cc
+/** \file blender/depsgraph/intern/nodes/deg_node.cc
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index d79d3d2348d..416996052c9 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsnode.h
+/** \file depsgraph/intern/nodes/deg_node.h
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 8e74317cfa2..f5f45dde519 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsnode_component.cc
+/** \file blender/depsgraph/intern/nodes/deg_node_component.cc
  *  \ingroup depsgraph
  */
 
@@ -256,7 +256,7 @@ OperationDepsNode *ComponentDepsNode::get_entry_operation()
 		entry_operation = op_node;
 		return op_node;
 	}
-	else if(operations.size() == 1) {
+	else if (operations.size() == 1) {
 		return operations[0];
 	}
 	return NULL;
@@ -279,7 +279,7 @@ OperationDepsNode *ComponentDepsNode::get_exit_operation()
 		exit_operation = op_node;
 		return op_node;
 	}
-	else if(operations.size() == 1) {
+	else if (operations.size() == 1) {
 		return operations[0];
 	}
 	return NULL;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index 6ff4345d28b..6f62d91cd79 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsnode_component.h
+/** \file blender/depsgraph/intern/nodes/deg_node_component.h
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
index a9f9703bb3b..5847af29ac2 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsnode_operation.cc
+/** \file blender/depsgraph/intern/nodes/deg_node_operation.cc
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.h b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
index f03078fc3db..598393054db 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/depsnode_operation.h
+/** \file blender/depsgraph/intern/nodes/deg_node_operation.h
  *  \ingroup depsgraph
  */
 
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 85e32144bcd..79961eae79d 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1765,8 +1765,8 @@ void UI_panel_category_draw_all(ARegion *ar, const char *category_id_active)
 			/* tab highlight (3d look) */
 			glColor3ubv(is_active ? theme_col_tab_highlight : theme_col_tab_highlight_inactive);
 			ui_panel_category_draw_tab(GL_LINE_STRIP, rct->xmin, rct->ymin, rct->xmax, rct->ymax,
-									   tab_curve_radius, roundboxtype, true, false,
-									   is_active ? theme_col_back : theme_col_tab_inactive);
+			                           tab_curve_radius, roundboxtype, true, false,
+			                           is_active ? theme_col_back : theme_col_tab_inactive);
 		}
 
 		/* tab blackline */
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index 3803221b496..b74c4b5f526 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -400,7 +400,7 @@ static int wm_collada_import_exec(bContext *C, wmOperator *op)
 	        C, filename,
 	        import_units,
 	        find_chains,
-			auto_connect,
+	        auto_connect,
 	        fix_orientation,
 	        min_chain_length))
 	{
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 0fd56fbcc4e..a84b8d9dcc8 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -2283,7 +2283,7 @@ static void knife_make_face_cuts(KnifeTool_OpData *kcd, BMFace *f, ListBase *kfe
 
 	BMEdge **edge_array = BLI_array_alloca(edge_array, edge_array_len);
 
-	 /* point to knife edges we've created edges in, edge_array aligned */
+	/* point to knife edges we've created edges in, edge_array aligned */
 	KnifeEdge **kfe_array = BLI_array_alloca(kfe_array, edge_array_len);
 
 	BLI_assert(BLI_gset_size(kcd->edgenet.edge_visit) == 0);
diff --git a/source/blender/editors/mesh/editmesh_rip.c b/source/blender/editors/mesh/editmesh_rip.c
index 9e71e646b1a..8868827a11f 100644
--- a/source/blender/editors/mesh/editmesh_rip.c
+++ b/source/blender/editors/mesh/editmesh_rip.c
@@ -463,7 +463,7 @@ static void edbm_tagged_loop_pairs_do_fill_faces(BMesh *bm, UnorderedLoopPair *u
 		if ((ulp->l_pair[0]    && ulp->l_pair[1]) &&
 		    (ulp->l_pair[0]->e != ulp->l_pair[1]->e))
 		{
-			 /* time has come to make a face! */
+			/* time has come to make a face! */
 			BMVert *v_shared = BM_edge_share_vert(ulp->l_pair[0]->e, ulp->l_pair[1]->e);
 			BMFace *f, *f_example = ulp->l_pair[0]->f;
 			BMLoop *l_iter;
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index 3da3a451d66..01535eac422 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2288,7 +2288,7 @@ static int remove_tagged_particles(Object *ob, ParticleSystem *psys, int mirror)
 			npoint= new_points= MEM_callocN(new_totpart * sizeof(PTCacheEditPoint), "PTCacheEditKey array");
 
 			if (ELEM(NULL, new_pars, new_points)) {
-				 /* allocation error! */
+				/* allocation error! */
 				if (new_pars)
 					MEM_freeN(new_pars);
 				if (new_points)
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 8db5a8f9bd3..06caf930988 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2979,7 +2979,7 @@ static void image_sample_apply(bContext *C, wmOperator *op, const wmEvent *event
 		if (ibuf->zbuf) {
 			info->z = ibuf->zbuf[y * ibuf->x + x];
 			info->zp = &info->z;
-			if (ibuf->zbuf == (int*)ibuf->rect) {
+			if (ibuf->zbuf == (int *)ibuf->rect) {
 				info->colp = NULL;
 			}
 		}
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 07e8325756f..7c12b8ea7a5 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3744,7 +3744,7 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d,
 	}
 
 	if ((dt > OB_WIRE) && (v3d->flag2 & V3D_RENDER_SHADOW)) {
-	    /* pass */
+		/* pass */
 	}
 	else {
 		/* annoying but active faces is stored differently */
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index c25ea33109d..1bd0ec23d65 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3620,7 +3620,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 		dist_range[0] = v3d->near * 1.5f;
 	}
 	else { /* othographic */
-		   /* find the current window width and height */
+		/* find the current window width and height */
 		vb[0] = ar->winx;
 		vb[1] = ar->winy;
 
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index e1cf7436236..d9b12bb0b18 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -599,15 +599,15 @@ static void initSnappingMode(TransInfo *t)
 	if (t->spacetype == SPACE_VIEW3D) {
 		if (t->tsnap.object_context == NULL) {
 			t->tsnap.object_context = ED_transform_snap_object_context_create_view3d(
-					G.main, t->scene, SNAP_OBJECT_USE_CACHE,
-					t->ar, t->view);
+			        G.main, t->scene, SNAP_OBJECT_USE_CACHE,
+			        t->ar, t->view);
 
 			ED_transform_snap_object_context_set_editmesh_callbacks(
-					t->tsnap.object_context,
-					(bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled,
-					bm_edge_is_snap_target,
-					bm_face_is_snap_target,
-					SET_UINT_IN_POINTER((BM_ELEM_SELECT | BM_ELEM_HIDDEN)));
+			        t->tsnap.object_context,
+			        (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled,
+			        bm_edge_is_snap_target,
+			        bm_face_is_snap_target,
+			        SET_UINT_IN_POINTER((BM_ELEM_SELECT | BM_ELEM_HIDDEN)));
 		}
 	}
 }
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
index 3f29d9899e8..9efbe6b53be 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
@@ -111,7 +111,7 @@ static PyObject *FrsNoise_drand(BPy_FrsNoise * /*self*/, PyObject *args, PyObjec
 		PyErr_SetString(PyExc_TypeError, "optional argument 1 must be of type int");
 		return NULL;
 	}
-	if (seed){
+	if (seed) {
 		RandGen::srand48(seed);
 	}
 	return PyFloat_FromDouble(RandGen::drand48());
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index f998dc9904e..89816b09024 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -91,7 +91,6 @@
 
 #ifdef WITH_OPENSUBDIV
 #  include "BKE_subsurf.h"
-#  include "BKE_DerivedMesh.h"
 #  include "BKE_editmesh.h"
 
 #  include "gpu_codegen.h"
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 68741578f27..52e40cbc098 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -85,8 +85,8 @@ typedef struct Camera {
 	char sensor_fit;
 	char pad[7];
 
-	 /* Stereo settings */
-	 struct CameraStereoSettings stereo;
+	/* Stereo settings */
+	struct CameraStereoSettings stereo;
 } Camera;
 
 /* **************** CAMERA ********************* */
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index 4f19e819625..b8783da73ca 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -1148,7 +1148,7 @@ void DNA_struct_switch_endian(SDNA *oldsdna, int oldSDNAnr, char *data)
 
 		/* test: is type a struct? */
 		if (spc[0] >= firststructtypenr && !ispointer(name)) {
-		  /* struct field type */
+			/* struct field type */
 			/* where does the old data start (is there one?) */
 			cpo = find_elem(oldsdna, type, name, spo, data, NULL);
 			if (cpo) {
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index c3c66625c84..1d3537dc9a0 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -196,7 +196,7 @@ static void rna_Scene_collada_export(
 
         int use_ngons,
         int use_object_instantiation,
-		int use_blender_profile,
+        int use_blender_profile,
         int sort_by_name,
         int export_transformation_type,
         int open_sim)
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c
index b22f5b662ba..5b65a2bbfd4 100644
--- a/source/blender/nodes/shader/node_shader_tree.c
+++ b/source/blender/nodes/shader/node_shader_tree.c
@@ -330,7 +330,7 @@ static void ntree_shader_link_builtin_group_normal(
 	node_group_input_verify(group_ntree, group_input_node, &group_ntree->id);
 	ntreeUpdateTree(G.main, group_ntree);
 	/* Assumes sockets are always added at the end. */
-	bNodeSocket *group_node_normal_socket = (bNodeSocket*)group_node->inputs.last;
+	bNodeSocket *group_node_normal_socket = group_node->inputs.last;
 	if (displacement_node == group_node) {
 		/* If displacement is coming from this node group we need to perform
 		 * some internal re-linking in order to avoid cycles.
diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.c b/source/blender/nodes/shader/nodes/node_shader_normal_map.c
index 57014bdc476..48d1688c386 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal_map.c
+++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.c
@@ -172,7 +172,8 @@ static int gpu_shader_normal_map(GPUMaterial *mat, bNode *node, bNodeExecData *U
 				break;
 		}
 
-	} else {
+	}
+	else {
 
 		/* ************** BLENDER INTERNAL without world space shading flag ******* */