Cleanup: indentation, style

6 files changed, 44 insertions, 41 deletions

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index ddf11d148cb..c934adc8762 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -962,15 +962,15 @@ static void curvemapping_evaluateRGBF_filmlike(const CurveMapping *cumap, float
  * \param black Use instead of cumap->black
  * \param bwmul Use instead of cumap->bwmul
  */
-void curvemapping_evaluate_premulRGBF_ex(const CurveMapping *cumap, float vecout[3], const float vecin[3],
-                                         const float black[3], const float bwmul[3])
+void curvemapping_evaluate_premulRGBF_ex(
+        const CurveMapping *cumap, float vecout[3], const float vecin[3],
+        const float black[3], const float bwmul[3])
 {
 	const float r = (vecin[0] - black[0]) * bwmul[0];
 	const float g = (vecin[1] - black[1]) * bwmul[1];
 	const float b = (vecin[2] - black[2]) * bwmul[2];
 
-	switch (cumap->tone)
-	{
+	switch (cumap->tone) {
 		default:
 		case CURVE_TONE_STANDARD:
 		{
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index a5235d00c1a..3fdd5de94f1 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -363,12 +363,13 @@ static Subdiv *multires_subdiv_for_reshape(struct Depsgraph *depsgraph,
 	return subdiv;
 }
 
-static bool multires_reshape_from_vertcos(struct Depsgraph *depsgraph,
-	                                      Object *object,
-                                          const MultiresModifierData *mmd,
-                                          const float (*deformed_verts)[3],
-                                          const int num_deformed_verts,
-                                          const bool use_render_params)
+static bool multires_reshape_from_vertcos(
+        struct Depsgraph *depsgraph,
+        Object *object,
+        const MultiresModifierData *mmd,
+        const float (*deformed_verts)[3],
+        const int num_deformed_verts,
+        const bool use_render_params)
 {
 	Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
 	Mesh *coarse_mesh = object->data;
@@ -476,7 +477,8 @@ bool multiresModifier_reshapeFromDeformModifier(
 	Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
 	/* Perform sanity checks and early output. */
 	if (multires_get_level(
-	        scene_eval, object, &highest_mmd, false, true) == 0) {
+	            scene_eval, object, &highest_mmd, false, true) == 0)
+	{
 		return false;
 	}
 	/* Create mesh for the multires, ignoring any further modifiers (leading
diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c
index 0f02df82cd5..d77bbe8a15d 100644
--- a/source/blender/blenkernel/intern/subdiv_foreach.c
+++ b/source/blender/blenkernel/intern/subdiv_foreach.c
@@ -746,15 +746,14 @@ static void subdiv_foreach_inner_vertices_special(
 	const int coarse_poly_index = coarse_poly - coarse_mesh->mpoly;
 	int ptex_face_index = ctx->face_ptex_offset[coarse_poly_index];
 	const int start_vertex_index = ctx->subdiv_vertex_offset[coarse_poly_index];
-	int subdiv_vertex_index =
-	        ctx->vertices_inner_offset + start_vertex_index;
+	int subdiv_vertex_index = ctx->vertices_inner_offset + start_vertex_index;
 	ctx->foreach_context->vertex_inner(
-			ctx->foreach_context,
+	        ctx->foreach_context,
 	        tls,
-			ptex_face_index,
-			1.0f, 1.0f,
-			coarse_poly_index, 0,
-			subdiv_vertex_index);
+	        ptex_face_index,
+	        1.0f, 1.0f,
+	        coarse_poly_index, 0,
+	        subdiv_vertex_index);
 	subdiv_vertex_index++;
 	for (int corner = 0;
 	     corner < coarse_poly->totloop;
@@ -1135,9 +1134,9 @@ static void subdiv_foreach_edges_all_patches_special(
 			const bool flip = (coarse_edge->v2 == coarse_loop->v);
 			int side_start_index =
 			        start_vertex_index + num_inner_vertices_per_ptex * corner;
-			for (int i = 0; i < ptex_face_resolution - 2;
-			     i++,
-				 subdiv_edge_index++)
+			for (int i = 0;
+			     i < ptex_face_resolution - 2;
+			     i++, subdiv_edge_index++)
 			{
 				const int v1 = (flip)
 				                   ? (start_edge_vertex + (resolution - i - 3))
@@ -1240,7 +1239,7 @@ static void subdiv_foreach_loops_of_poly(
         int subdiv_loop_start_index,
         const int ptex_face_index,
         const int coarse_poly_index,
-		const int coarse_corner_index,
+        const int coarse_corner_index,
         const int rotation,
         /*const*/ int v0, /*const*/ int e0,
         /*const*/ int v1, /*const*/ int e1,
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c
index ae637031140..8f0b2bb8242 100644
--- a/source/blender/blenkernel/intern/subdiv_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_mesh.c
@@ -556,7 +556,7 @@ static void evaluate_vertex_and_apply_displacement_copy(
         const int ptex_face_index,
         const float u, const float v,
         const MVert *coarse_vert,
-		MVert *subdiv_vert)
+        MVert *subdiv_vert)
 {
 	/* Displacement is accumulated in subdiv vertex position.
 	 * need to back it up before copying data fro original vertex.
@@ -578,7 +578,7 @@ static void evaluate_vertex_and_apply_displacement_interpolate(
         const int ptex_face_index,
         const float u, const float v,
         VerticesForInterpolation *vertex_interpolation,
-		MVert *subdiv_vert)
+        MVert *subdiv_vert)
 {
 	/* Displacement is accumulated in subdiv vertex position.
 	 * need to back it up before copying data fro original vertex.
@@ -685,10 +685,11 @@ static void subdiv_mesh_ensure_vertex_interpolation(
 	}
 	/* Update it for a new corner if needed. */
 	if (!tls->vertex_interpolation_initialized ||
-	     tls->vertex_interpolation_coarse_corner != coarse_corner) {
+	    tls->vertex_interpolation_coarse_corner != coarse_corner)
+	{
 		vertex_interpolation_from_corner(
 		        ctx, &tls->vertex_interpolation, coarse_poly, coarse_corner);
-	 }
+	}
 	/* Store settings used for the current state of interpolator. */
 	tls->vertex_interpolation_initialized = true;
 	tls->vertex_interpolation_coarse_poly = coarse_poly;
@@ -861,10 +862,11 @@ static void subdiv_mesh_ensure_loop_interpolation(
 	}
 	/* Update it for a new corner if needed. */
 	if (!tls->loop_interpolation_initialized ||
-	     tls->loop_interpolation_coarse_corner != coarse_corner) {
+	    tls->loop_interpolation_coarse_corner != coarse_corner)
+	{
 		loop_interpolation_from_corner(
 		        ctx, &tls->loop_interpolation, coarse_poly, coarse_corner);
-	 }
+	}
 	/* Store settings used for the current state of interpolator. */
 	tls->loop_interpolation_initialized = true;
 	tls->loop_interpolation_coarse_poly = coarse_poly;
@@ -878,7 +880,7 @@ static void subdiv_mesh_loop(
         const float u, const float v,
         const int UNUSED(coarse_loop_index),
         const int coarse_poly_index,
-		const int coarse_corner,
+        const int coarse_corner,
         const int subdiv_loop_index,
         const int subdiv_vertex_index, const int subdiv_edge_index)
 {
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index cbf1a02a46c..331db5b6ff0 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -992,7 +992,7 @@ static void initialize_all_tracks(StabContext *ctx, float aspect)
 	 * By definition, offset contribution is zero there.
 	 */
 	int reference_frame = tracking->stabilization.anchor_frame;
-	float average_angle=0, average_scale_step=0;
+	float average_angle = 0, average_scale_step = 0;
 	float average_translation[2], average_pos[2], pivot[2];
 	zero_v2(average_translation);
 	zero_v2(pivot);
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index 8c1b846db84..621e0cc6a2e 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -853,17 +853,17 @@ static ImBuf *accessor_get_ibuf(TrackingImageAccessor *accessor,
 }
 
 static libmv_CacheKey accessor_get_image_callback(
-		struct libmv_FrameAccessorUserData *user_data,
-		int clip_index,
-		int frame,
-		libmv_InputMode input_mode,
-		int downscale,
-		const libmv_Region *region,
-		const libmv_FrameTransform *transform,
-		float **destination,
-		int *width,
-		int *height,
-		int *channels)
+        struct libmv_FrameAccessorUserData *user_data,
+        int clip_index,
+        int frame,
+        libmv_InputMode input_mode,
+        int downscale,
+        const libmv_Region *region,
+        const libmv_FrameTransform *transform,
+        float **destination,
+        int *width,
+        int *height,
+        int *channels)
 {
 	TrackingImageAccessor *accessor = (TrackingImageAccessor *) user_data;
 	ImBuf *ibuf;