Cleanup: style, duplicate includes

5 files changed, 18 insertions, 34 deletions

diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index cd6b6540012..be27560bbf2 100644
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@@ -22,7 +22,7 @@
 #ifndef __BKE_GPENCIL_MODIFIER_H__
 #define __BKE_GPENCIL_MODIFIER_H__
 
-/** \file BKE_greasepencil_modifier.h
+/** \file BKE_gpencil_modifier.h
  *  \ingroup bke
  */
 
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index de3f891f9f9..c86f39f1d55 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -546,7 +546,7 @@ void BKE_gpencil_stroke_weights_duplicate(bGPDstroke *gps_src, bGPDstroke *gps_d
 	}
 	BLI_assert(gps_src->totpoints == gps_dst->totpoints);
 
-	if ((gps_src->dvert == NULL) || (gps_dst->dvert == NULL)){
+	if ((gps_src->dvert == NULL) || (gps_dst->dvert == NULL)) {
 		return;
 	}
 
@@ -1050,7 +1050,7 @@ Material *BKE_gpencil_get_material_from_brush(Brush *brush)
 	Material *ma = NULL;
 
 	if ((brush != NULL) && (brush->gpencil_settings != NULL) &&
-		(brush->gpencil_settings->material != NULL))
+	    (brush->gpencil_settings->material != NULL))
 	{
 		ma = brush->gpencil_settings->material;
 	}
@@ -1076,7 +1076,7 @@ Material *BKE_gpencil_material_ensure(Main *bmain, Object *ob)
 		assign_material(bmain, ob, ma, ob->totcol, BKE_MAT_ASSIGN_EXISTING);
 	}
 	else if (ma->gp_style == NULL) {
-			BKE_material_init_gpencil_settings(ma);
+		BKE_material_init_gpencil_settings(ma);
 	}
 
 	return ma;
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 2ba738902a0..3c2196afb18 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -384,8 +384,7 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *g
 	const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
 
 	for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
-		if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
-		{
+		if (GPENCIL_MODIFIER_ACTIVE(md, is_render)) {
 			const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
 
 			if (GPENCIL_MODIFIER_EDIT(md, is_edit)) {
@@ -407,8 +406,7 @@ void BKE_gpencil_geometry_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer
 	const bool is_edit = GPENCIL_ANY_EDIT_MODE(gpd);
 
 	for (md = ob->greasepencil_modifiers.first; md; md = md->next) {
-		if (GPENCIL_MODIFIER_ACTIVE(md, is_render))
-		{
+		if (GPENCIL_MODIFIER_ACTIVE(md, is_render)) {
 			const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
 
 			if (GPENCIL_MODIFIER_EDIT(md, is_edit)) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 9c7ce7698f7..41c23c46c44 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3821,24 +3821,18 @@ bool BKE_object_modifier_gpencil_use_time(Object *ob, GpencilModifierData *md)
 
 		/* action - check for F-Curves with paths containing 'grease_pencil_modifiers[' */
 		if (adt->action) {
-			for (fcu = (FCurve *)adt->action->curves.first;
-				fcu != NULL;
-				fcu = (FCurve *)fcu->next)
-			{
-				if (fcu->rna_path && strstr(fcu->rna_path, pattern))
+			for (fcu = adt->action->curves.first; fcu != NULL; fcu = fcu->next) {
+				if (fcu->rna_path && strstr(fcu->rna_path, pattern)) {
 					return true;
+				}
 			}
 		}
 
-		/* This here allows modifier properties to get driven and still update properly
-		*
-		*/
-		for (fcu = (FCurve *)adt->drivers.first;
-			fcu != NULL;
-			fcu = (FCurve *)fcu->next)
-		{
-			if (fcu->rna_path && strstr(fcu->rna_path, pattern))
+		/* This here allows modifier properties to get driven and still update properly */
+		for (fcu = adt->drivers.first; fcu != NULL; fcu = fcu->next) {
+			if (fcu->rna_path && strstr(fcu->rna_path, pattern)) {
 				return true;
+			}
 		}
 	}
 
@@ -3862,22 +3856,14 @@ bool BKE_object_shaderfx_use_time(Object *ob, ShaderFxData *fx)
 
 		/* action - check for F-Curves with paths containing string[' */
 		if (adt->action) {
-			for (fcu = (FCurve *)adt->action->curves.first;
-				fcu != NULL;
-				fcu = (FCurve *)fcu->next)
-			{
+			for (fcu = adt->action->curves.first; fcu != NULL; fcu = fcu->next) {
 				if (fcu->rna_path && strstr(fcu->rna_path, pattern))
 					return true;
 			}
 		}
 
-		/* This here allows properties to get driven and still update properly
-		*
-		*/
-		for (fcu = (FCurve *)adt->drivers.first;
-			fcu != NULL;
-			fcu = (FCurve *)fcu->next)
-		{
+		/* This here allows properties to get driven and still update properly */
+		for (fcu = adt->drivers.first; fcu != NULL; fcu = fcu->next) {
 			if (fcu->rna_path && strstr(fcu->rna_path, pattern))
 				return true;
 		}
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c
index 895d527ea5c..db7366a2414 100644
--- a/source/blender/blenkernel/intern/subdiv_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_mesh.c
@@ -277,7 +277,7 @@ static void subdiv_mesh_ctx_init_offsets(SubdivMeshContext *ctx)
 			        num_ptex_faces_per_poly *
 			                (num_inner_edges_per_ptex_face_get(
 			                         no_quad_patch_resolution - 1) +
-		                     (no_quad_patch_resolution - 2) +
+			                 (no_quad_patch_resolution - 2) +
 			                 num_subdiv_vertices_per_coarse_edge);
 			if (no_quad_patch_resolution >= 3) {
 				edge_offset += coarse_poly->totloop;
@@ -2193,7 +2193,7 @@ static void subdiv_copy_poly_data(const SubdivMeshContext *ctx,
 static void subdiv_create_polys(SubdivMeshContext *ctx, int poly_index)
 {
 	const int resolution = ctx->settings->resolution;
-    const int start_poly_index = ctx->subdiv_polygon_offset[poly_index];
+	const int start_poly_index = ctx->subdiv_polygon_offset[poly_index];
 	/* Base/coarse mesh information. */
 	const Mesh *coarse_mesh = ctx->coarse_mesh;
 	const MPoly *coarse_mpoly = coarse_mesh->mpoly;