From 1e4aab36c237b751c23be161217d989472bfaf20 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 26 Jan 2019 20:41:52 +1100 Subject: Cleanup: remove redundant BKE/BLI/BIF headers --- source/blender/modifiers/intern/MOD_armature.c | 1 - source/blender/modifiers/intern/MOD_bevel.c | 2 -- source/blender/modifiers/intern/MOD_decimate.c | 1 - source/blender/modifiers/intern/MOD_dynamicpaint.c | 1 - source/blender/modifiers/intern/MOD_edgesplit.c | 1 - source/blender/modifiers/intern/MOD_fluidsim_util.c | 8 ++++---- source/blender/modifiers/intern/MOD_mask.c | 1 - source/blender/modifiers/intern/MOD_meshcache.c | 2 -- source/blender/modifiers/intern/MOD_meshsequencecache.c | 2 +- source/blender/modifiers/intern/MOD_multires.c | 1 - source/blender/modifiers/intern/MOD_ocean.c | 6 ------ source/blender/modifiers/intern/MOD_particleinstance.c | 1 - source/blender/modifiers/intern/MOD_remesh.c | 3 ++- source/blender/modifiers/intern/MOD_screw.c | 1 - source/blender/modifiers/intern/MOD_shrinkwrap.c | 1 - source/blender/modifiers/intern/MOD_smoke.c | 2 -- source/blender/modifiers/intern/MOD_surfacedeform.c | 1 - source/blender/modifiers/intern/MOD_uvproject.c | 1 - source/blender/modifiers/intern/MOD_weighted_normal.c | 1 - source/blender/modifiers/intern/MOD_weightvgedit.c | 1 - source/blender/modifiers/intern/MOD_weightvgmix.c | 1 - 21 files changed, 7 insertions(+), 32 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index fcd54639f9f..d410de17046 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -40,7 +40,6 @@ #include "DNA_mesh_types.h" #include "BLI_utildefines.h" -#include "BLI_string.h" #include "BKE_editmesh.h" #include "BKE_lattice.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 568cdcf6707..89608f33344 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -40,9 +40,7 @@ #include "DNA_scene_types.h" #include "BLI_utildefines.h" -#include "BLI_linklist_stack.h" #include "BLI_math.h" -#include "BLI_string.h" #include "BKE_deform.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index c7adedeae25..fe274b53cc7 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -43,7 +43,6 @@ #include "BKE_deform.h" #include "BKE_mesh.h" -#include "BKE_library.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index c23a65ec23c..c7360051109 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -37,7 +37,6 @@ #include "BKE_dynamicpaint.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 8db8da3fc81..465e07c7bd4 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -40,7 +40,6 @@ #include "BLI_utildefines.h" #include "BLI_math.h" -#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 23a62f88f77..4d79a84b157 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -42,16 +42,16 @@ #include "DNA_meshdata_types.h" #include "DNA_object_fluidsim_types.h" -#include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_fluidsim.h" /* ensure definitions here match */ #ifdef WITH_MOD_FLUID +# include "BLI_blenlib.h" +# include "BLI_math.h" + # include "BKE_global.h" +# include "BKE_library.h" #endif -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_mesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 555fe29978f..e054973b376 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -47,7 +47,6 @@ #include "BKE_action.h" /* BKE_pose_channel_find_name */ #include "BKE_customdata.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index e3aa239a713..2545b636bed 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -36,8 +36,6 @@ #include "BLI_path_util.h" #include "BLI_math.h" -#include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_scene.h" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index f0cdd2b2899..15303b87c21 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -32,7 +32,6 @@ #include "DNA_scene_types.h" #include "BKE_cachefile.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_scene.h" @@ -44,6 +43,7 @@ #ifdef WITH_ALEMBIC # include "ABC_alembic.h" # include "BKE_global.h" +# include "BKE_library.h" #endif static void initData(ModifierData *md) diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index a18fd6a4c5e..98f455e186c 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -42,7 +42,6 @@ #include "BLI_utildefines.h" #include "BKE_cdderivedmesh.h" -#include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_modifier.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 8231745aa12..2b2fa2ff2df 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -36,14 +36,8 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_math_inline.h" -#include "BLI_task.h" #include "BLI_utildefines.h" -#include "BKE_global.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_ocean.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index fa305f4c8a7..0317ec8e26b 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -43,7 +43,6 @@ #include "BLI_utildefines.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_lattice.h" #include "BKE_library_query.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 6d0f88df492..8de5a9c0e1f 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -27,7 +27,6 @@ #include "MEM_guardedalloc.h" #include "BLI_math_base.h" -#include "BLI_math_vector.h" #include "BLI_utildefines.h" #include "DNA_meshdata_types.h" @@ -45,6 +44,8 @@ #include #ifdef WITH_MOD_REMESH +# include "BLI_math_vector.h" + # include "dualcon.h" #endif diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 9629b0924ad..a88310a121f 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -44,7 +44,6 @@ #include "BLI_alloca.h" #include "BLI_utildefines.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index 92cbbaa78ca..ef950e35441 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -38,7 +38,6 @@ #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_editmesh.h" diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 8fac27272b0..efced596bea 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -48,9 +48,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_library_query.h" -#include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_smoke.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index a208055d9cf..902224f8243 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -27,7 +27,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_alloca.h" #include "BLI_math.h" #include "BLI_math_geom.h" #include "BLI_task.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 0da96ba1a38..c47b0a06215 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -46,7 +46,6 @@ #include "BKE_camera.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_material.h" #include "BKE_mesh.h" diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index 0e116b2e021..faa947c914c 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -32,7 +32,6 @@ #include "BKE_cdderivedmesh.h" #include "BKE_deform.h" #include "BKE_library.h" -#include "BKE_library_query.h" #include "BKE_mesh.h" #include "BLI_math.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index bf7517ee634..5a1bc907b89 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -41,7 +41,6 @@ #include "BKE_colortools.h" /* CurveMapping. */ #include "BKE_deform.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_modifier.h" #include "BKE_texture.h" /* Texture masking. */ diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 674ef106737..d4ec3cf7004 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -39,7 +39,6 @@ #include "BKE_customdata.h" #include "BKE_deform.h" -#include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_modifier.h" #include "BKE_texture.h" /* Texture masking. */ -- cgit v1.2.3