Cleanup: whitespace, long lines, duplicate include

12 files changed, 161 insertions, 113 deletions

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 78e421d6a29..f799d7d62e6 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -152,7 +152,9 @@ typedef struct DrawEngineType {
 	void (*view_update)(void *vedata);
 	void (*id_update)(void *vedata, struct ID *id);
 
-	void (*render_to_image)(void *vedata, struct RenderEngine *engine, struct RenderLayer *layer, const struct rcti *rect);
+	void (*render_to_image)(
+	        void *vedata, struct RenderEngine *engine,
+	        struct RenderLayer *layer, const struct rcti *rect);
 } DrawEngineType;
 
 #ifndef __DRW_ENGINE_H__
@@ -318,10 +320,14 @@ DRWShadingGroup *DRW_shgroup_material_empty_tri_batch_create(struct GPUMaterial
 DRWShadingGroup *DRW_shgroup_instance_create(
         struct GPUShader *shader, DRWPass *pass, struct Gwn_Batch *geom, struct Gwn_VertFormat *format);
 DRWShadingGroup *DRW_shgroup_point_batch_create(struct GPUShader *shader, DRWPass *pass);
-DRWShadingGroup *DRW_shgroup_line_batch_create_with_format(struct GPUShader *shader, DRWPass *pass, struct Gwn_VertFormat *format);
-DRWShadingGroup *DRW_shgroup_line_batch_create(struct GPUShader *shader, DRWPass *pass);
-DRWShadingGroup *DRW_shgroup_empty_tri_batch_create(struct GPUShader *shader, DRWPass *pass, int size);
-DRWShadingGroup *DRW_shgroup_transform_feedback_create(struct GPUShader *shader, DRWPass *pass, struct Gwn_VertBuf *tf_target);
+DRWShadingGroup *DRW_shgroup_line_batch_create_with_format(
+        struct GPUShader *shader, DRWPass *pass, struct Gwn_VertFormat *format);
+DRWShadingGroup *DRW_shgroup_line_batch_create(
+        struct GPUShader *shader, DRWPass *pass);
+DRWShadingGroup *DRW_shgroup_empty_tri_batch_create(
+        struct GPUShader *shader, DRWPass *pass, int size);
+DRWShadingGroup *DRW_shgroup_transform_feedback_create(
+        struct GPUShader *shader, DRWPass *pass, struct Gwn_VertBuf *tf_target);
 
 typedef void (DRWCallGenerateFn)(
         DRWShadingGroup *shgroup,
@@ -440,8 +446,10 @@ void DRW_render_instance_buffer_finish(void);
 
 /* ViewLayers */
 void *DRW_view_layer_engine_data_get(DrawEngineType *engine_type);
-void **DRW_view_layer_engine_data_ensure_ex(struct ViewLayer *view_layer, DrawEngineType *engine_type, void (*callback)(void *storage));
-void **DRW_view_layer_engine_data_ensure(DrawEngineType *engine_type, void (*callback)(void *storage));
+void **DRW_view_layer_engine_data_ensure_ex(
+        struct ViewLayer *view_layer, DrawEngineType *engine_type, void (*callback)(void *storage));
+void **DRW_view_layer_engine_data_ensure(
+        DrawEngineType *engine_type, void (*callback)(void *storage));
 
 /* Objects */
 ObjectEngineData *DRW_object_engine_data_get(Object *ob, DrawEngineType *engine_type);
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index ed2b52700d9..147d166e8b0 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -373,7 +373,8 @@ static void drw_shgroup_bone_axes(const float (*bone_mat)[4], const float color[
 static void drw_shgroup_bone_relationship_lines(const float start[3], const float end[3])
 {
 	if (g_data.lines_relationship == NULL) {
-		g_data.lines_relationship = shgroup_dynlines_dashed_uniform_color(g_data.passes.relationship_lines, g_theme.wire_color);
+		g_data.lines_relationship = shgroup_dynlines_dashed_uniform_color(
+		        g_data.passes.relationship_lines, g_theme.wire_color);
 	}
 	/* reverse order to have less stipple overlap */
 	float v[3];
@@ -956,7 +957,8 @@ static void ebone_spline_preview(EditBone *ebone, float result_array[MAX_BBONE_S
 
 			size_to_mat4(bscalemat, bscale);
 
-			/* Note: don't multiply by inverse scale mat here, as it causes problems with scaling shearing and breaking segment chains */
+			/* Note: don't multiply by inverse scale mat here,
+			 * as it causes problems with scaling shearing and breaking segment chains */
 			mul_m4_series(result_array[a], result_array[a], bscalemat);
 		}
 	}
@@ -1055,7 +1057,8 @@ static void draw_axes(EditBone *eBone, bPoseChannel *pchan)
 	const float *col = (g_theme.const_color) ? g_theme.const_color :
 	                   (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? g_theme.text_hi_color : g_theme.text_color;
 	copy_v4_v4(final_col, col);
-	final_col[3] = (g_theme.const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.3 : 0.8; /* Mix with axes color. */
+	/* Mix with axes color. */
+	final_col[3] = (g_theme.const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.3 : 0.8;
 	drw_shgroup_bone_axes(BONE_VAR(eBone, pchan, disp_mat), final_col);
 }
 
@@ -1107,8 +1110,9 @@ static void draw_points(
 		if (eBone) {
 			if (!((eBone->parent) && !EBONE_VISIBLE(arm, eBone->parent))) {
 				if (is_envelope_draw) {
-					drw_shgroup_bone_envelope(eBone->disp_mat, col_solid_root, col_hint_root, col_wire_root,
-					                          &eBone->rad_head, &envelope_ignore);
+					drw_shgroup_bone_envelope(
+					        eBone->disp_mat, col_solid_root, col_hint_root, col_wire_root,
+					        &eBone->rad_head, &envelope_ignore);
 				}
 				else {
 					drw_shgroup_bone_point(eBone->disp_mat, col_solid_root, col_hint_root, col_wire_root);
@@ -1119,8 +1123,9 @@ static void draw_points(
 			Bone *bone = pchan->bone;
 			if (!((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)))) {
 				if (is_envelope_draw) {
-					drw_shgroup_bone_envelope(pchan->disp_mat, col_solid_root, col_hint_root, col_wire_root,
-					                          &bone->rad_head, &envelope_ignore);
+					drw_shgroup_bone_envelope(
+					        pchan->disp_mat, col_solid_root, col_hint_root, col_wire_root,
+					        &bone->rad_head, &envelope_ignore);
 				}
 				else {
 					drw_shgroup_bone_point(pchan->disp_mat, col_solid_root, col_hint_root, col_wire_root);
@@ -1137,7 +1142,8 @@ static void draw_points(
 	if (is_envelope_draw) {
 		const float *rad_tail = eBone ? &eBone->rad_tail : &pchan->bone->rad_tail;
 		drw_shgroup_bone_envelope(
-		            BONE_VAR(eBone, pchan, disp_mat), col_solid_tail, col_hint_tail, col_wire_tail, &envelope_ignore, rad_tail);
+		        BONE_VAR(eBone, pchan, disp_mat), col_solid_tail, col_hint_tail, col_wire_tail,
+		        &envelope_ignore, rad_tail);
 	}
 	else {
 		drw_shgroup_bone_point(BONE_VAR(eBone, pchan, disp_tail_mat), col_solid_tail, col_hint_tail, col_wire_tail);
@@ -1211,7 +1217,9 @@ static void draw_bone_envelope(
 		DRW_select_load_id(select_id | BONESEL_BONE);
 	}
 
-	drw_shgroup_bone_envelope(BONE_VAR(eBone, pchan, disp_mat), col_solid, col_hint, col_wire, rad_head, rad_tail);
+	drw_shgroup_bone_envelope(
+	        BONE_VAR(eBone, pchan, disp_mat), col_solid, col_hint, col_wire,
+	        rad_head, rad_tail);
 
 	if (select_id != -1) {
 		DRW_select_load_id(-1);
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index a8d3b4294a0..3c312205ec2 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -2046,9 +2046,9 @@ Gwn_Batch *DRW_cache_bone_point_wire_outline_get(void)
 		for (int a = 0; a < CIRCLE_RESOL; a++) {
 			v1[0] = radius * sinf((2.0f * M_PI * a) / ((float)CIRCLE_RESOL));
 			v1[1] = radius * cosf((2.0f * M_PI * a) / ((float)CIRCLE_RESOL));
-			GWN_vertbuf_attr_set(vbo, attr_id.pos0, v  , v0);
+			GWN_vertbuf_attr_set(vbo, attr_id.pos0, v,   v0);
 			GWN_vertbuf_attr_set(vbo, attr_id.pos1, v++, v1);
-			GWN_vertbuf_attr_set(vbo, attr_id.pos0, v  , v0);
+			GWN_vertbuf_attr_set(vbo, attr_id.pos0, v,   v0);
 			GWN_vertbuf_attr_set(vbo, attr_id.pos1, v++, v1);
 			copy_v2_v2(v0, v1);
 		}
diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h
index 8cf38cdd123..b8f2beb6fdc 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -167,11 +167,16 @@ struct Gwn_Batch *DRW_cache_lattice_wire_get(struct Object *ob, bool use_weight)
 struct Gwn_Batch *DRW_cache_lattice_vert_overlay_get(struct Object *ob);
 
 /* Particles */
-struct Gwn_Batch *DRW_cache_particles_get_hair(struct Object *object, struct ParticleSystem *psys, struct ModifierData *md);
-struct Gwn_Batch *DRW_cache_particles_get_dots(struct Object *object, struct ParticleSystem *psys);
-struct Gwn_Batch *DRW_cache_particles_get_edit_strands(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
-struct Gwn_Batch *DRW_cache_particles_get_edit_inner_points(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
-struct Gwn_Batch *DRW_cache_particles_get_edit_tip_points(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
+struct Gwn_Batch *DRW_cache_particles_get_hair(
+        struct Object *object, struct ParticleSystem *psys, struct ModifierData *md);
+struct Gwn_Batch *DRW_cache_particles_get_dots(
+        struct Object *object, struct ParticleSystem *psys);
+struct Gwn_Batch *DRW_cache_particles_get_edit_strands(
+        struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
+struct Gwn_Batch *DRW_cache_particles_get_edit_inner_points(
+        struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
+struct Gwn_Batch *DRW_cache_particles_get_edit_tip_points(
+        struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
 struct Gwn_Batch *DRW_cache_particles_get_prim(int type);
 
 /* Metaball */
diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h
index 3ca53b92946..44000f076b9 100644
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@ -64,7 +64,8 @@ struct Gwn_Batch *DRW_curve_batch_cache_get_normal_edge(
 struct Gwn_Batch *DRW_curve_batch_cache_get_overlay_edges(struct Curve *cu);
 struct Gwn_Batch *DRW_curve_batch_cache_get_overlay_verts(struct Curve *cu);
 
-struct Gwn_Batch *DRW_curve_batch_cache_get_triangles_with_normals(struct Curve *cu, struct CurveCache *ob_curve_cache);
+struct Gwn_Batch *DRW_curve_batch_cache_get_triangles_with_normals(
+        struct Curve *cu, struct CurveCache *ob_curve_cache);
 struct Gwn_Batch **DRW_curve_batch_cache_get_surface_shaded(
         struct Curve *cu, struct CurveCache *ob_curve_cache,
         struct GPUMaterial **gpumat_array, uint gpumat_array_len);
@@ -124,10 +125,15 @@ struct Gwn_Batch *DRW_mesh_batch_cache_get_verts_with_select_id(struct Mesh *me,
 void DRW_mesh_cache_sculpt_coords_ensure(struct Mesh *me);
 
 /* Particles */
-struct Gwn_Batch *DRW_particles_batch_cache_get_hair(struct Object *object, struct ParticleSystem *psys, struct ModifierData *md);
-struct Gwn_Batch *DRW_particles_batch_cache_get_dots(struct Object *object, struct ParticleSystem *psys);
-struct Gwn_Batch *DRW_particles_batch_cache_get_edit_strands(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
-struct Gwn_Batch *DRW_particles_batch_cache_get_edit_inner_points(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
-struct Gwn_Batch *DRW_particles_batch_cache_get_edit_tip_points(struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
+struct Gwn_Batch *DRW_particles_batch_cache_get_hair(
+        struct Object *object, struct ParticleSystem *psys, struct ModifierData *md);
+struct Gwn_Batch *DRW_particles_batch_cache_get_dots(
+        struct Object *object, struct ParticleSystem *psys);
+struct Gwn_Batch *DRW_particles_batch_cache_get_edit_strands(
+        struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
+struct Gwn_Batch *DRW_particles_batch_cache_get_edit_inner_points(
+        struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
+struct Gwn_Batch *DRW_particles_batch_cache_get_edit_tip_points(
+        struct Object *object, struct ParticleSystem *psys, struct PTCacheEdit *edit);
 
 #endif /* __DRAW_CACHE_IMPL_H__ */
diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c
index 09531220d9a..3eecff024a1 100644
--- a/source/blender/draw/intern/draw_cache_impl_displist.c
+++ b/source/blender/draw/intern/draw_cache_impl_displist.c
@@ -176,7 +176,8 @@ Gwn_IndexBuf *DRW_displist_indexbuf_calc_triangles_in_order(ListBase *lb)
 
 Gwn_IndexBuf **DRW_displist_indexbuf_calc_triangles_in_order_split_by_material(ListBase *lb, uint gpumat_array_len)
 {
-	Gwn_IndexBuf **shaded_triangles_in_order = MEM_callocN(sizeof(*shaded_triangles_in_order) * gpumat_array_len, __func__);
+	Gwn_IndexBuf **shaded_triangles_in_order = MEM_callocN(
+	        sizeof(*shaded_triangles_in_order) * gpumat_array_len, __func__);
 	Gwn_IndexBufBuilder *elb = BLI_array_alloca(elb, gpumat_array_len);
 
 	const int tri_len = curve_render_surface_tri_len_get(lb);
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 00d404e1571..1a14eb2b413 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1953,7 +1953,8 @@ static Gwn_VertBuf *mesh_batch_cache_get_tri_shading_data(MeshRenderData *rdata,
 			GWN_vertformat_alias_add(format, attrib_name);
 
 			/* +1 include null terminator. */
-			auto_ofs += 1 + BLI_snprintf_rlen(cache->auto_layer_names + auto_ofs, auto_names_len - auto_ofs, "b%s", attrib_name);
+			auto_ofs += 1 + BLI_snprintf_rlen(
+			        cache->auto_layer_names + auto_ofs, auto_names_len - auto_ofs, "b%s", attrib_name);
 			cache->auto_layer_is_srgb[auto_id++] = 0; /* tag as not srgb */
 
 			if (i == rdata->cd.layers.uv_active) {
@@ -1988,7 +1989,8 @@ static Gwn_VertBuf *mesh_batch_cache_get_tri_shading_data(MeshRenderData *rdata,
 				GWN_vertformat_alias_add(format, attrib_name);
 
 				/* +1 include null terminator. */
-				auto_ofs += 1 + BLI_snprintf_rlen(cache->auto_layer_names + auto_ofs, auto_names_len - auto_ofs, "b%s", attrib_name);
+				auto_ofs += 1 + BLI_snprintf_rlen(
+				        cache->auto_layer_names + auto_ofs, auto_names_len - auto_ofs, "b%s", attrib_name);
 				cache->auto_layer_is_srgb[auto_id++] = 1; /* tag as srgb */
 			}
 
@@ -3829,8 +3831,9 @@ Gwn_Batch *DRW_mesh_batch_cache_get_edge_detection(Mesh *me)
 
 		MeshRenderData *rdata = mesh_render_data_create(me, options);
 
-		cache->edge_detection = GWN_batch_create_ex(GWN_PRIM_LINES_ADJ, mesh_batch_cache_get_vert_pos_and_nor_in_order(rdata, cache),
-		                                                                mesh_batch_cache_get_edges_adjacency(rdata, cache), 0);
+		cache->edge_detection = GWN_batch_create_ex(
+		        GWN_PRIM_LINES_ADJ, mesh_batch_cache_get_vert_pos_and_nor_in_order(rdata, cache),
+		        mesh_batch_cache_get_edges_adjacency(rdata, cache), 0);
 
 		mesh_render_data_free(rdata);
 	}
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index c6cc243638b..c89ea67a39c 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -599,7 +599,9 @@ static void particle_batch_cache_ensure_pos(Object *object,
 				val = len_v3(pa->state.vel) / psys->part->color_vec_max;
 				break;
 			case PART_DRAW_COL_ACC:
-				val = len_v3v3(pa->state.vel, pa->prev_state.vel) / ((pa->state.time - pa->prev_state.time) * psys->part->color_vec_max);
+				val = len_v3v3(
+				        pa->state.vel,
+				        pa->prev_state.vel) / ((pa->state.time - pa->prev_state.time) * psys->part->color_vec_max);
 				break;
 			default:
 				val = -1.0f;
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index c2b00a74dac..11e04306143 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -224,8 +224,8 @@ DRWShadingGroup *shgroup_dynlines_flat_color(DRWPass *pass)
 	GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_FLAT_COLOR);
 
 	DRW_shgroup_instance_format(g_formats.dynlines_color, {
-		{"pos"      , DRW_ATTRIB_FLOAT, 3},
-		{"color"    , DRW_ATTRIB_FLOAT, 4}
+		{"pos",       DRW_ATTRIB_FLOAT, 3},
+		{"color",     DRW_ATTRIB_FLOAT, 4}
 	});
 
 	DRWShadingGroup *grp = DRW_shgroup_line_batch_create_with_format(sh, pass, g_formats.dynlines_color);
@@ -288,7 +288,7 @@ DRWShadingGroup *shgroup_instance_screenspace(DRWPass *pass, struct Gwn_Batch *g
 
 	DRW_shgroup_instance_format(g_formats.instance_screenspace, {
 		{"world_pos", DRW_ATTRIB_FLOAT, 3},
-		{"color"    , DRW_ATTRIB_FLOAT, 3}
+		{"color",     DRW_ATTRIB_FLOAT, 3}
 	});
 
 	DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_screenspace);
@@ -307,7 +307,7 @@ DRWShadingGroup *shgroup_instance_solid(DRWPass *pass, struct Gwn_Batch *geom)
 
 	DRW_shgroup_instance_format(g_formats.instance_color, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"color"              , DRW_ATTRIB_FLOAT, 4}
+		{"color",               DRW_ATTRIB_FLOAT, 4}
 	});
 
 	DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_color);
@@ -322,7 +322,7 @@ DRWShadingGroup *shgroup_instance_wire(DRWPass *pass, struct Gwn_Batch *geom)
 
 	DRW_shgroup_instance_format(g_formats.instance_color, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"color"              , DRW_ATTRIB_FLOAT, 4}
+		{"color",               DRW_ATTRIB_FLOAT, 4}
 	});
 
 	DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom, g_formats.instance_color);
@@ -335,8 +335,8 @@ DRWShadingGroup *shgroup_instance_screen_aligned(DRWPass *pass, struct Gwn_Batch
 	GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED);
 
 	DRW_shgroup_instance_format(g_formats.instance_screen_aligned, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
-		{"size"               , DRW_ATTRIB_FLOAT, 1},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
+		{"size",                DRW_ATTRIB_FLOAT, 1},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -351,8 +351,8 @@ DRWShadingGroup *shgroup_instance_axis_names(DRWPass *pass, struct Gwn_Batch *ge
 	GPUShader *sh = GPU_shader_get_builtin_shader(GPU_SHADER_3D_INSTANCE_SCREEN_ALIGNED_AXIS);
 
 	DRW_shgroup_instance_format(g_formats.instance_screen_aligned, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
-		{"size"               , DRW_ATTRIB_FLOAT, 1},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
+		{"size",                DRW_ATTRIB_FLOAT, 1},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -367,8 +367,8 @@ DRWShadingGroup *shgroup_instance_scaled(DRWPass *pass, struct Gwn_Batch *geom)
 	GPUShader *sh_inst = GPU_shader_get_builtin_shader(GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SCALE);
 
 	DRW_shgroup_instance_format(g_formats.instance_scaled, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
-		{"size"               , DRW_ATTRIB_FLOAT, 3},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
+		{"size",                DRW_ATTRIB_FLOAT, 3},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -382,8 +382,8 @@ DRWShadingGroup *shgroup_instance(DRWPass *pass, struct Gwn_Batch *geom)
 	GPUShader *sh_inst = GPU_shader_get_builtin_shader(GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE);
 
 	DRW_shgroup_instance_format(g_formats.instance_sized, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
-		{"size"               , DRW_ATTRIB_FLOAT, 1},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
+		{"size",                DRW_ATTRIB_FLOAT, 1},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -397,8 +397,8 @@ DRWShadingGroup *shgroup_instance_outline(DRWPass *pass, struct Gwn_Batch *geom,
 	GPUShader *sh_inst = GPU_shader_get_builtin_shader(GPU_SHADER_INSTANCE_VARIYING_ID_VARIYING_SIZE);
 
 	DRW_shgroup_instance_format(g_formats.instance_outline, {
-		{"callId"             , DRW_ATTRIB_INT,   1},
-		{"size"               , DRW_ATTRIB_FLOAT, 1},
+		{"callId",              DRW_ATTRIB_INT,   1},
+		{"size",                DRW_ATTRIB_FLOAT, 1},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -413,10 +413,10 @@ DRWShadingGroup *shgroup_camera_instance(DRWPass *pass, struct Gwn_Batch *geom)
 	GPUShader *sh_inst = GPU_shader_get_builtin_shader(GPU_SHADER_CAMERA);
 
 	DRW_shgroup_instance_format(g_formats.instance_camera, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
-		{"corners"            , DRW_ATTRIB_FLOAT, 8},
-		{"depth"              , DRW_ATTRIB_FLOAT, 1},
-		{"tria"               , DRW_ATTRIB_FLOAT, 4},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
+		{"corners",             DRW_ATTRIB_FLOAT, 8},
+		{"depth",               DRW_ATTRIB_FLOAT, 1},
+		{"tria",                DRW_ATTRIB_FLOAT, 4},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -431,9 +431,9 @@ DRWShadingGroup *shgroup_distance_lines_instance(DRWPass *pass, struct Gwn_Batch
 	static float point_size = 4.0f;
 
 	DRW_shgroup_instance_format(g_formats.instance_distance_lines, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
-		{"start"              , DRW_ATTRIB_FLOAT, 1},
-		{"end"                , DRW_ATTRIB_FLOAT, 1},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
+		{"start",               DRW_ATTRIB_FLOAT, 1},
+		{"end",                 DRW_ATTRIB_FLOAT, 1},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -450,7 +450,7 @@ DRWShadingGroup *shgroup_spot_instance(DRWPass *pass, struct Gwn_Batch *geom)
 	static const int False = false;
 
 	DRW_shgroup_instance_format(g_formats.instance_spot, {
-		{"color"              , DRW_ATTRIB_FLOAT, 3},
+		{"color",               DRW_ATTRIB_FLOAT, 3},
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
 	});
 
@@ -472,12 +472,13 @@ DRWShadingGroup *shgroup_instance_bone_axes(DRWPass *pass)
 
 	DRW_shgroup_instance_format(g_formats.instance_color, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"color"              , DRW_ATTRIB_FLOAT, 4}
+		{"color",               DRW_ATTRIB_FLOAT, 4}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_axes,
-	                                                   pass, DRW_cache_bone_arrows_get(),
-	                                                   g_formats.instance_color);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_axes,
+	        pass, DRW_cache_bone_arrows_get(),
+	        g_formats.instance_color);
 	DRW_shgroup_uniform_vec3(grp, "screenVecs[0]", DRW_viewport_screenvecs_get(), 2);
 
 	return grp;
@@ -492,15 +493,16 @@ DRWShadingGroup *shgroup_instance_bone_envelope_outline(DRWPass *pass)
 	}
 
 	DRW_shgroup_instance_format(g_formats.instance_bone_envelope_outline, {
-		{"headSphere"          , DRW_ATTRIB_FLOAT, 4},
-		{"tailSphere"          , DRW_ATTRIB_FLOAT, 4},
-		{"outlineColorSize"    , DRW_ATTRIB_FLOAT, 4},
-		{"xAxis"               , DRW_ATTRIB_FLOAT, 3}
+		{"headSphere",           DRW_ATTRIB_FLOAT, 4},
+		{"tailSphere",           DRW_ATTRIB_FLOAT, 4},
+		{"outlineColorSize",     DRW_ATTRIB_FLOAT, 4},
+		{"xAxis",                DRW_ATTRIB_FLOAT, 3}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_envelope_outline,
-	                                                   pass, DRW_cache_bone_envelope_outline_get(),
-	                                                   g_formats.instance_bone_envelope_outline);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_envelope_outline,
+	        pass, DRW_cache_bone_envelope_outline_get(),
+	        g_formats.instance_bone_envelope_outline);
 	DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
 
 	return grp;
@@ -515,14 +517,15 @@ DRWShadingGroup *shgroup_instance_bone_envelope_distance(DRWPass *pass)
 	}
 
 	DRW_shgroup_instance_format(g_formats.instance_bone_envelope_distance, {
-		{"headSphere"          , DRW_ATTRIB_FLOAT, 4},
-		{"tailSphere"          , DRW_ATTRIB_FLOAT, 4},
-		{"xAxis"               , DRW_ATTRIB_FLOAT, 3}
+		{"headSphere",           DRW_ATTRIB_FLOAT, 4},
+		{"tailSphere",           DRW_ATTRIB_FLOAT, 4},
+		{"xAxis",                DRW_ATTRIB_FLOAT, 3}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_envelope_distance,
-	                                                   pass, DRW_cache_bone_envelope_solid_get(),
-	                                                   g_formats.instance_bone_envelope_distance);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_envelope_distance,
+	        pass, DRW_cache_bone_envelope_solid_get(),
+	        g_formats.instance_bone_envelope_distance);
 
 	return grp;
 }
@@ -536,16 +539,17 @@ DRWShadingGroup *shgroup_instance_bone_envelope_solid(DRWPass *pass)
 	}
 
 	DRW_shgroup_instance_format(g_formats.instance_bone_envelope, {
-		{"headSphere"          , DRW_ATTRIB_FLOAT, 4},
-		{"tailSphere"          , DRW_ATTRIB_FLOAT, 4},
-		{"boneColor"           , DRW_ATTRIB_FLOAT, 3},
-		{"stateColor"          , DRW_ATTRIB_FLOAT, 3},
-		{"xAxis"               , DRW_ATTRIB_FLOAT, 3}
+		{"headSphere",           DRW_ATTRIB_FLOAT, 4},
+		{"tailSphere",           DRW_ATTRIB_FLOAT, 4},
+		{"boneColor",            DRW_ATTRIB_FLOAT, 3},
+		{"stateColor",           DRW_ATTRIB_FLOAT, 3},
+		{"xAxis",                DRW_ATTRIB_FLOAT, 3}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_envelope,
-	                                                   pass, DRW_cache_bone_envelope_solid_get(),
-	                                                   g_formats.instance_bone_envelope);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_envelope,
+	        pass, DRW_cache_bone_envelope_solid_get(),
+	        g_formats.instance_bone_envelope);
 
 	return grp;
 }
@@ -559,14 +563,15 @@ DRWShadingGroup *shgroup_instance_mball_handles(DRWPass *pass)
 	}
 
 	DRW_shgroup_instance_format(g_formats.instance_mball_handles, {
-		{"ScaleTranslationMatrix" , DRW_ATTRIB_FLOAT, 12},
-		{"radius"                 , DRW_ATTRIB_FLOAT, 1},
-		{"color"                  , DRW_ATTRIB_FLOAT, 3}
+		{"ScaleTranslationMatrix",  DRW_ATTRIB_FLOAT, 12},
+		{"radius",                  DRW_ATTRIB_FLOAT, 1},
+		{"color",                   DRW_ATTRIB_FLOAT, 3}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.mball_handles, pass,
-	                                                   DRW_cache_screenspace_circle_get(),
-	                                                   g_formats.instance_mball_handles);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.mball_handles, pass,
+	        DRW_cache_screenspace_circle_get(),
+	        g_formats.instance_mball_handles);
 	DRW_shgroup_uniform_vec3(grp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2);
 
 	return grp;
@@ -585,11 +590,12 @@ DRWShadingGroup *shgroup_instance_bone_shape_outline(DRWPass *pass, struct Gwn_B
 
 	DRW_shgroup_instance_format(g_formats.instance_bone_outline, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"outlineColorSize"   , DRW_ATTRIB_FLOAT, 4}
+		{"outlineColorSize",    DRW_ATTRIB_FLOAT, 4}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.shape_outline,
-	                                                   pass, geom, g_formats.instance_bone_outline);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.shape_outline,
+	        pass, geom, g_formats.instance_bone_outline);
 	DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
 
 	return grp;
@@ -605,12 +611,13 @@ DRWShadingGroup *shgroup_instance_bone_shape_solid(DRWPass *pass, struct Gwn_Bat
 
 	DRW_shgroup_instance_format(g_formats.instance_bone, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"boneColor"           , DRW_ATTRIB_FLOAT, 3},
-		{"stateColor"          , DRW_ATTRIB_FLOAT, 3}
+		{"boneColor",            DRW_ATTRIB_FLOAT, 3},
+		{"stateColor",           DRW_ATTRIB_FLOAT, 3}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.shape_solid,
-	                                                   pass, geom, g_formats.instance_bone);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.shape_solid,
+	        pass, geom, g_formats.instance_bone);
 	DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
 
 	return grp;
@@ -626,12 +633,13 @@ DRWShadingGroup *shgroup_instance_bone_sphere_solid(DRWPass *pass)
 
 	DRW_shgroup_instance_format(g_formats.instance_bone, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"boneColor"           , DRW_ATTRIB_FLOAT, 3},
-		{"stateColor"          , DRW_ATTRIB_FLOAT, 3}
+		{"boneColor",           DRW_ATTRIB_FLOAT, 3},
+		{"stateColor",          DRW_ATTRIB_FLOAT, 3}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_sphere,
-	                                                   pass, DRW_cache_bone_point_get(), g_formats.instance_bone);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_sphere,
+	        pass, DRW_cache_bone_point_get(), g_formats.instance_bone);
 
 	return grp;
 }
@@ -646,12 +654,13 @@ DRWShadingGroup *shgroup_instance_bone_sphere_outline(DRWPass *pass)
 
 	DRW_shgroup_instance_format(g_formats.instance_bone_outline, {
 		{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16},
-		{"outlineColorSize"   , DRW_ATTRIB_FLOAT, 4}
+		{"outlineColorSize",    DRW_ATTRIB_FLOAT, 4}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_sphere_outline,
-	                                                   pass, DRW_cache_bone_point_wire_outline_get(),
-	                                                   g_formats.instance_bone_outline);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_sphere_outline,
+	        pass, DRW_cache_bone_point_wire_outline_get(),
+	        g_formats.instance_bone_outline);
 	DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
 
 	return grp;
@@ -667,16 +676,17 @@ DRWShadingGroup *shgroup_instance_bone_stick(DRWPass *pass)
 
 	DRW_shgroup_instance_format(g_formats.instance_bone_stick, {
 		{"boneStart", DRW_ATTRIB_FLOAT, 3},
-		{"boneEnd"  , DRW_ATTRIB_FLOAT, 3},
+		{"boneEnd",   DRW_ATTRIB_FLOAT, 3},
 		{"wireColor", DRW_ATTRIB_FLOAT, 4}, /* TODO port theses to uchar color */
 		{"boneColor", DRW_ATTRIB_FLOAT, 4},
 		{"headColor", DRW_ATTRIB_FLOAT, 4},
 		{"tailColor", DRW_ATTRIB_FLOAT, 4}
 	});
 
-	DRWShadingGroup *grp = DRW_shgroup_instance_create(g_shaders.bone_stick,
-	                                                   pass, DRW_cache_bone_stick_get(),
-	                                                   g_formats.instance_bone_stick);
+	DRWShadingGroup *grp = DRW_shgroup_instance_create(
+	        g_shaders.bone_stick,
+	        pass, DRW_cache_bone_stick_get(),
+	        g_formats.instance_bone_stick);
 	DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
 
 	return grp;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index e28278d0b67..9c5ca46e1a2 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -587,7 +587,8 @@ static void drw_viewport_var_init(void)
 void DRW_viewport_matrix_get(float mat[4][4], DRWViewportMatrixType type)
 {
 	BLI_assert(type >= 0 && type < DRW_MAT_COUNT);
-	BLI_assert(((DST.override_mat & (1 << type)) != 0) || DST.draw_ctx.rv3d != NULL); /* Can't use this in render mode. */
+	/* Can't use this in render mode. */
+	BLI_assert(((DST.override_mat & (1 << type)) != 0) || DST.draw_ctx.rv3d != NULL);
 
 	copy_m4_m4(mat, DST.view_data.matstate.mat[type]);
 }
@@ -700,7 +701,8 @@ void *DRW_view_layer_engine_data_get(DrawEngineType *engine_type)
 	return NULL;
 }
 
-void **DRW_view_layer_engine_data_ensure_ex(ViewLayer *view_layer, DrawEngineType *engine_type, void (*callback)(void *storage))
+void **DRW_view_layer_engine_data_ensure_ex(
+        ViewLayer *view_layer, DrawEngineType *engine_type, void (*callback)(void *storage))
 {
 	ViewLayerEngineData *sled;
 
@@ -1558,7 +1560,8 @@ static void draw_select_framebuffer_setup(const rcti *rect)
 	}
 
 	if (g_select_buffer.texture_depth == NULL) {
-		g_select_buffer.texture_depth = GPU_texture_create_2D(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect), GPU_DEPTH_COMPONENT24, NULL, NULL);
+		g_select_buffer.texture_depth = GPU_texture_create_2D(
+		        BLI_rcti_size_x(rect), BLI_rcti_size_y(rect), GPU_DEPTH_COMPONENT24, NULL, NULL);
 
 		GPU_framebuffer_texture_attach(g_select_buffer.framebuffer, g_select_buffer.texture_depth, 0, 0);
 
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index 1e2036714bf..b4dce47413e 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -797,7 +797,8 @@ DRWShadingGroup *DRW_shgroup_point_batch_create(struct GPUShader *shader, DRWPas
 	return shgroup;
 }
 
-DRWShadingGroup *DRW_shgroup_line_batch_create_with_format(struct GPUShader *shader, DRWPass *pass, Gwn_VertFormat *format)
+DRWShadingGroup *DRW_shgroup_line_batch_create_with_format(
+        struct GPUShader *shader, DRWPass *pass, Gwn_VertFormat *format)
 {
 	DRWShadingGroup *shgroup = drw_shgroup_create_ex(shader, pass);
 	shgroup->type = DRW_SHG_LINE_BATCH;
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 14994e72169..fe1e780b813 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -822,7 +822,8 @@ static void draw_geometry_execute_ex(
 	}
 
 	/* step 2 : bind vertex array & draw */
-	GWN_batch_program_set_no_use(geom, GPU_shader_get_program(shgroup->shader), GPU_shader_get_interface(shgroup->shader));
+	GWN_batch_program_set_no_use(
+	        geom, GPU_shader_get_program(shgroup->shader), GPU_shader_get_interface(shgroup->shader));
 	/* XXX hacking gawain. we don't want to call glUseProgram! (huge performance loss) */
 	geom->program_in_use = true;