Cleanup: style, duplicate includes

21 files changed, 70 insertions, 69 deletions

diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c
index b96e04a8a60..41c1c73e49c 100644
--- a/source/blender/editors/armature/editarmature_sketch.c
+++ b/source/blender/editors/armature/editarmature_sketch.c
@@ -2033,12 +2033,12 @@ static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch,
 				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 				switch (sketch->next_point.mode) {
-				case PT_SNAP:
-					copy_v4_fl4(tmp_color, 0.0f, 1.0f, 0.0f, 1.0f);
-					break;
-				case PT_PROJECT:
-					copy_v4_fl4(tmp_color, 0.0f, 0.0f, 0.0f, 1.0f);
-					break;
+					case PT_SNAP:
+						copy_v4_fl4(tmp_color, 0.0f, 1.0f, 0.0f, 1.0f);
+						break;
+					case PT_PROJECT:
+						copy_v4_fl4(tmp_color, 0.0f, 0.0f, 0.0f, 1.0f);
+						break;
 				}
 
 				sk_drawPoint(&sketch->next_point, 0.1, tmp_color);
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 0cb8b9211ae..e46c6a0e267 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1650,7 +1650,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
 	immUniformColor3ubv((unsigned char *)wcol->item);
 	glEnable(GL_LINE_SMOOTH);
 	glEnable(GL_BLEND);
-	immBegin(GWN_PRIM_LINE_STRIP, (CM_TABLE+1) + 2);
+	immBegin(GWN_PRIM_LINE_STRIP, (CM_TABLE + 1) + 2);
 	
 	if (cuma->table == NULL)
 		curvemapping_changed(cumap, false);
@@ -1812,14 +1812,14 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 			UI_GetThemeColor4fv(TH_MARKER_OUTLINE, col_outline);
 
 			/* Do stipple cross with geometry */
-			immBegin(GWN_PRIM_LINES, 7*2*2);
+			immBegin(GWN_PRIM_LINES, 7 * 2 * 2);
 			float pos_sel[8] = {-10.0f, -7.0f, -4.0f, -1.0f, 2.0f, 5.0f, 8.0f, 11.0f};
 			for (int axe = 0; axe < 2; ++axe) {
 				for (int i = 0; i < 7; ++i) {
 					float x1 = pos_sel[i] * (1 - axe);
 					float y1 = pos_sel[i] * axe;
-					float x2 = pos_sel[i+1] * (1 - axe);
-					float y2 = pos_sel[i+1] * axe;
+					float x2 = pos_sel[i + 1] * (1 - axe);
+					float y2 = pos_sel[i + 1] * axe;
 
 					if (i % 2 == 1)
 						immAttrib4fv(col, col_sel);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index e1739af3f0d..ebd4ce36bbe 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -121,7 +121,7 @@ static void template_add_button_search_menu(
 		/* Ugly exception for screens here, drawing their preview in icon size looks ugly/useless */
 		const bool use_preview_icon = use_big_size || (id && (GS(id->name) != ID_SCR));
 		const short width = UI_UNIT_X * (use_big_size ? 6 : 1.6f);
-		const short height = UI_UNIT_Y * (use_big_size ? 6: 1);
+		const short height = UI_UNIT_Y * (use_big_size ? 6 : 1);
 
 		but = uiDefBlockButN(block, block_func, block_argN, "", 0, 0, width, height, tip);
 		if (use_preview_icon) {
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index 53cc6607b2e..bb625bc0ff8 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -1565,7 +1565,7 @@ void UI_view2d_multi_grid_draw(View2D *v2d, int colorid, float step, int level_s
 	}
 
 	/* X and Y axis */
-	UI_GetThemeColorShade3ubv(colorid, -18 + ((totlevels - 1) * -6) , grid_line_color);
+	UI_GetThemeColorShade3ubv(colorid, -18 + ((totlevels - 1) * -6), grid_line_color);
 
 	immSkipAttrib(color);
 	immVertex2f(pos, 0.0f, v2d->cur.ymin);
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
index 0769d128b4d..ec490a0d047 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
@@ -221,7 +221,7 @@ static void dial_ghostarc_get_angles(
 	plane_from_point_normal_v3(dial_plane, mpr->matrix_basis[3], axis_vec);
 
 	if (!ED_view3d_win_to_ray(ar, v3d, inter->init_mval, ray_co, ray_no, false) ||
-		!isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
+	    !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
 	{
 		goto fail;
 	}
@@ -229,7 +229,7 @@ static void dial_ghostarc_get_angles(
 	sub_v3_v3(proj_mval_init_rel, mpr->matrix_basis[3]);
 
 	if (!ED_view3d_win_to_ray(ar, v3d, mval, ray_co, ray_no, false) ||
-		!isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
+	    !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
 	{
 		goto fail;
 	}
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 72bc61139c6..6ed1c021c6c 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -823,8 +823,8 @@ void ED_mask_draw_frames(Mask *mask, ARegion *ar, const int cfra, const int sfra
 			immBegin(GWN_PRIM_LINES, 2 * num_lines);
 
 			for (MaskLayerShape *masklay_shape = masklay->splines_shapes.first;
-				  masklay_shape;
-				  masklay_shape = masklay_shape->next)
+			     masklay_shape;
+			     masklay_shape = masklay_shape->next)
 			{
 				int frame = masklay_shape->frame;
 
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index baeab6d2071..b2a16d9373b 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3303,13 +3303,13 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 		/* editmode separate */
 		switch (type) {
 			case MESH_SEPARATE_SELECTED:
-			    retval = mesh_separate_selected(bmain, scene, sl, base, em->bm);
+				retval = mesh_separate_selected(bmain, scene, sl, base, em->bm);
 				break;
 			case MESH_SEPARATE_MATERIAL:
-			    retval = mesh_separate_material(bmain, scene, sl, base, em->bm);
+				retval = mesh_separate_material(bmain, scene, sl, base, em->bm);
 				break;
 			case MESH_SEPARATE_LOOSE:
-			    retval = mesh_separate_loose(bmain, scene, sl, base, em->bm);
+				retval = mesh_separate_loose(bmain, scene, sl, base, em->bm);
 				break;
 			default:
 				BLI_assert(0);
@@ -3344,10 +3344,10 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 
 					switch (type) {
 						case MESH_SEPARATE_MATERIAL:
-						    retval_iter = mesh_separate_material(bmain, scene, sl, base_iter, bm_old);
+							retval_iter = mesh_separate_material(bmain, scene, sl, base_iter, bm_old);
 							break;
 						case MESH_SEPARATE_LOOSE:
-						    retval_iter = mesh_separate_loose(bmain, scene, sl, base_iter, bm_old);
+							retval_iter = mesh_separate_loose(bmain, scene, sl, base_iter, bm_old);
 							break;
 						default:
 							BLI_assert(0);
diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c
index 87b59da6c62..d526ea93ffa 100644
--- a/source/blender/editors/object/object_facemap_ops.c
+++ b/source/blender/editors/object/object_facemap_ops.c
@@ -146,7 +146,7 @@ static void object_fmap_swap_object_mode(Object *ob, int num1, int num2)
 					if (num1 != -1) {
 						if (map[i] == num1)
 							map[i] = num2;
-						else if (map[i]== num2)
+						else if (map[i] == num2)
 							map[i] = num1;
 					}
 				}
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 628c5b846a3..280294e714d 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -940,13 +940,13 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
 	{
 		switch (action) {
 			case SEL_SELECT:
-			    ED_object_base_select(base, BA_SELECT);
+				ED_object_base_select(base, BA_SELECT);
 				break;
 			case SEL_DESELECT:
-			    ED_object_base_select(base, BA_DESELECT);
+				ED_object_base_select(base, BA_DESELECT);
 				break;
 			case SEL_INVERT:
-			    if ((base->flag & BASE_SELECTED) != 0) {
+				if ((base->flag & BASE_SELECTED) != 0) {
 					ED_object_base_select(base, BA_DESELECT);
 				}
 				else {
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c
index 0f06d66d033..631d891ce02 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_draw.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c
@@ -234,7 +234,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 
 				/* check if visible */
 				if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
-					 IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
+				    IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
 				{
 					MovieTrackingTrack *track = channel->track;
 					int i;
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index bc218a3594d..c1e298c426f 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -400,7 +400,7 @@ static void file_draw_preview(
 	/* border */
 	if (use_dropshadow) {
 		Gwn_VertFormat *format = immVertexFormat();
-		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2,GWN_FETCH_FLOAT);
+		unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
 		immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 		immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index af71851cf64..7cb22dcc570 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/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 */
 
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index a9066086467..7ecb5cb072d 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/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);
-			ak = ak->next)
-		{
+		for (; (ak) && (ak->cfra <= v2d->cur.xmax); ak = ak->next) {
 			immVertex2f(pos, ak->cfra, ymin);
 			immVertex2f(pos, ak->cfra, ymax);
 		}
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c
index 11aa3476ee1..b4bd425b038 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -439,7 +439,7 @@ static void drawcube_size(float xsize, float ysize, float zsize)
 		/* Elements */
 		GWN_indexbuf_init(&elb, GWN_PRIM_LINES, 12, 8);
 		for (int i = 0; i < 12; ++i) {
-			GWN_indexbuf_add_line_verts(&elb, cube_wire[i*2], cube_wire[i*2+1]);
+			GWN_indexbuf_add_line_verts(&elb, cube_wire[i * 2], cube_wire[i * 2 + 1]);
 		}
 		GWN_indexbuf_build_in_place(&elb, &el);
 
@@ -591,7 +591,7 @@ static void draw_bone_octahedral(void)
 		/* Elements */
 		GWN_indexbuf_init(&elb, GWN_PRIM_LINES, 12, 6);
 		for (int i = 0; i < 12; ++i) {
-			GWN_indexbuf_add_line_verts(&elb, bone_octahedral_wire[i*2], bone_octahedral_wire[i*2+1]);
+			GWN_indexbuf_add_line_verts(&elb, bone_octahedral_wire[i * 2], bone_octahedral_wire[i * 2 + 1]);
 		}
 		GWN_indexbuf_build_in_place(&elb, &el);
 
@@ -938,7 +938,7 @@ static void draw_sphere_bone_wire(float smat[4][4], float imat[4][4],
 	
 	/* base */
 	if (armflag & ARM_EDITMODE) {
-		if (boneflag & BONE_SELECTED){
+		if (boneflag & BONE_SELECTED) {
 			UI_GetThemeColor4fv(TH_SELECT, fcolor);
 		}
 		else {
@@ -1738,7 +1738,7 @@ static void imm_sphere_project(unsigned int pos, float ax, float az)
 static void draw_dof_ellipse(unsigned int pos, float ax, float az)
 {
 	const int n = 16;
-	const int tri = n*n - 2*n + 1; /* Yay fancy math ! */
+	const int tri = n * n - 2 * n + 1; /* Yay fancy math ! */
 	const float staticSine[16] = {
 		0.0f, 0.104528463268f, 0.207911690818f, 0.309016994375f,
 		0.406736643076f, 0.5f, 0.587785252292f, 0.669130606359f,
@@ -1755,7 +1755,7 @@ static void draw_dof_ellipse(unsigned int pos, float ax, float az)
 
 	immUniformColor4ub(70, 70, 70, 50);
 
-	immBegin(GWN_PRIM_TRIS, tri*3);
+	immBegin(GWN_PRIM_TRIS, tri * 3);
 	pz = 0.0f;
 	for (i = 1; i < n; i++) {
 		z = staticSine[i];
@@ -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);
-									else rgba_float_args_set(fcolor, 200.f/255.f, 200.f/255.f, 50.f/255.f, 1.0f);  /* add theme! */
+									if (constflag & PCHAN_HAS_TARGET) {
+										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,8 +2257,9 @@ 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));
 								}
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index fa88d63ae1c..07d072f0156 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -823,7 +823,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *UNUSED(rv3d), const floa
 	const float outlineWidth = 1.0f * U.pixelsize;
 	const float size = U.obcenter_dia * U.pixelsize + outlineWidth;
 
- 	if (v3d->zbuf) {
+	if (v3d->zbuf) {
 		glDisable(GL_DEPTH_TEST);
 		/* TODO(merwin): fit things like this into plates/buffers design */
 	}
@@ -860,7 +860,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *UNUSED(rv3d), const floa
 	GPU_disable_program_point_size();
 	glDisable(GL_BLEND);
 
- 	if (v3d->zbuf) {
+	if (v3d->zbuf) {
 		glEnable(GL_DEPTH_TEST);
 	}
 }
@@ -8760,7 +8760,7 @@ void draw_object(
 		if ((dflag & DRAW_PICKING) == 0) {
 			if ((dt == OB_BOUNDBOX) || ELEM(ob->type, OB_EMPTY, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
 				goto afterdraw;
-				}
+			}
 		}
 
 		switch (ob->type) {
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index b01c8a7ac8a..ed4d7861d6d 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/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"
 
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index b3b5beb54fe..d24c8241855 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/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"
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index d50133e406c..b54d1254293 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/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;
 		}
 	}
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 215be83abf4..2bed1dd28f2 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -317,7 +317,7 @@ static bool fcu_test_selected(FCurve *fcu)
 /* helper for recalcData() - for Action Editor transforms */
 static void recalcData_actedit(TransInfo *t)
 {
-	SceneLayer *sl= t->scene_layer;
+	SceneLayer *sl = t->scene_layer;
 	SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
 	
 	bAnimContext ac = {NULL};
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index f64b0cc2fae..c0c7c922061 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1185,7 +1185,7 @@ static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulat
 		/* custom handler! */
 		WM_manipulator_set_fn_custom_modal(axis, manipulator_modal);
 
-		switch(axis_idx) {
+		switch (axis_idx) {
 			case MAN_AXIS_TRANS_X:
 			case MAN_AXIS_TRANS_Y:
 			case MAN_AXIS_TRANS_Z:
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index 55ce45e5e2a..4ff4c3223f0 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/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++)
-		GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->static_tris[i*2]);
+	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);
 
 
@@ -1601,16 +1602,17 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
 
 		for (j = 1; j < stitch_preview->uvs_per_polygon[i] - 1; ++j) {
 			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index]);
-			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j+0)*2]);
-			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j+1)*2]);
+			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j + 0) * 2]);
+			GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j + 1) * 2]);
 
-			GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j+0)*2]);
-			GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j+1)*2]);
+			GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j + 0) * 2]);
+			GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j + 1) * 2]);
 		}
 
 		/* 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++)
-			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i*2]);
+		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++)
-			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i*2]);
+		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++)
-			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i*2]);
+		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++)
-			GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i*2]);
+		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);
 	}
 }