From 10850f0db93b8570cd904cfcc3133a14842f4d16 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 13 Jun 2022 16:02:44 +0200 Subject: Cleanup: Use more specific includes for grease pencil modifiers Also remove unused includes in some cases. This should make these files recompile less often. --- source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c | 3 +-- source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c | 9 +++++---- source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c | 1 - source/blender/gpencil_modifiers/intern/MOD_gpencildash.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c | 3 +-- source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c | 6 ++++-- source/blender/gpencil_modifiers/intern/MOD_gpencillength.c | 3 ++- source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c | 8 +++----- source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c | 4 ++-- source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c | 5 ++--- source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c | 7 +++---- source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c | 4 +--- source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c | 3 +-- source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c | 1 - source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c | 3 +-- .../blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c | 4 +--- .../gpencil_modifiers/intern/MOD_gpencilweight_proximity.c | 3 +-- 22 files changed, 34 insertions(+), 45 deletions(-) (limited to 'source/blender/gpencil_modifiers') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c index 6cf7f6f11e5..d59d2cb52fc 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c @@ -7,7 +7,7 @@ #include -#include "BLI_blenlib.h" +#include "BLI_listbase.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index f5ecce69129..092253dde79 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -8,10 +8,9 @@ #include #include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index cba5ca7b069..407055c6165 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -11,7 +11,7 @@ #include "BLI_hash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c index 88515d849bc..cf390e8d3a0 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c @@ -7,14 +7,15 @@ #include #include +#include #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" - -#include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_listbase.h" +#include "BLI_math_base.h" +#include "BLI_math_vector.h" #include "BLI_sort.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c index 792def30812..8ada66cfd55 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c @@ -9,7 +9,6 @@ #include "BLI_utildefines.h" -#include "BLI_blenlib.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c index f023b00480c..41015c429fe 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencildash.c @@ -9,7 +9,7 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_string.h" #include "DNA_defaults.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c index e5604005240..0f1652a5620 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilenvelope.c @@ -8,8 +8,8 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" #include "BLI_math_geom.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -22,7 +22,6 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index bc0464cb4f9..652894af017 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -6,12 +6,14 @@ */ #include +#include #include "BLI_listbase.h" +#include "BLI_math_base.h" +#include "BLI_math_matrix.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" -#include "BLI_math.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c index c92c062348c..5a358f5b3a1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillength.c @@ -6,10 +6,11 @@ */ #include +#include #include "BLI_hash.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_base.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c index a07ef2eb195..67e2c31d96b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c @@ -7,9 +7,8 @@ #include -#include "BLI_utildefines.h" - #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -22,9 +21,6 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "MOD_gpencil_lineart.h" -#include "lineart/MOD_lineart.h" - #include "BKE_collection.h" #include "BKE_context.h" #include "BKE_global.h" @@ -43,8 +39,10 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" +#include "MOD_gpencil_lineart.h" #include "MOD_gpencil_modifiertypes.h" #include "MOD_gpencil_ui_common.h" +#include "lineart/MOD_lineart.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index 6460a69a6cc..df66251159c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -10,7 +10,7 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c index d80e32feb2e..fd4eb5da835 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c @@ -16,8 +16,8 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "BLI_blenlib.h" -#include "BLI_math.h" +#include "BLI_listbase.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c index 259e62a249c..253603aea67 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c @@ -7,11 +7,10 @@ #include -#include "BLI_listbase.h" -#include "BLI_utildefines.h" - #include "BLI_hash.h" +#include "BLI_listbase.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c index f201a147082..ba88c83161f 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c @@ -7,15 +7,14 @@ #include +#include "BLI_hash.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_rand.h" #include "BLI_utildefines.h" #include "BLT_translation.h" -#include "BLI_hash.h" -#include "BLI_math.h" -#include "BLI_rand.h" - #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index b964b143a0f..0bcbd71f029 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -6,12 +6,10 @@ */ #include +#include #include "BLI_utildefines.h" -#include "BLI_blenlib.h" -#include "BLI_math_vector.h" - #include "BLT_translation.h" #include "DNA_defaults.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c index 7de1cc89a45..cd2373dcb26 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilshrinkwrap.c @@ -9,7 +9,7 @@ #include /* For #MEMCPY_STRUCT_AFTER. */ #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -18,7 +18,6 @@ #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c index e7dfdfee8d2..07350b73ce3 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c @@ -16,7 +16,6 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "DNA_vec_types.h" #include "BKE_context.h" #include "BKE_gpencil_geom.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c index 5c8c65b9f97..6ba7a934bff 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c @@ -8,7 +8,7 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "BLT_translation.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 3ddb508d58a..68fe15df898 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -8,7 +8,7 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_defaults.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c index 8fa14496616..ad8804782e8 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c @@ -10,7 +10,7 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "DNA_defaults.h" #include "DNA_gpencil_modifier_types.h" @@ -47,7 +47,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "DEG_depsgraph_query.h" static void initData(GpencilModifierData *md) { diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c index e90408b1a94..f40e6ba0728 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c @@ -8,7 +8,7 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_defaults.h" @@ -18,7 +18,6 @@ #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" @@ -29,7 +28,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "DEG_depsgraph_query.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c index d2c31591a98..1a6cadabf51 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c @@ -8,7 +8,7 @@ #include #include "BLI_listbase.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_defaults.h" @@ -29,7 +29,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "DEG_depsgraph_query.h" #include "UI_interface.h" #include "UI_resources.h" -- cgit v1.2.3