diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-26 12:41:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-26 13:20:25 +0300 |
commit | 1e4aab36c237b751c23be161217d989472bfaf20 (patch) | |
tree | aad83d43f5b0cc531623f1351abeaff063b3b72f /source/blender/blenkernel/intern | |
parent | 19b5f5493cd6a9b60486d570b6a50c7a42a96ae0 (diff) |
Cleanup: remove redundant BKE/BLI/BIF headers
Diffstat (limited to 'source/blender/blenkernel/intern')
68 files changed, 14 insertions, 137 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index 6ec1b1b36b9..b3b503d9ff7 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -30,7 +30,6 @@ #include "BLI_sys_types.h" // for intptr_t support #include "BLI_utildefines.h" /* for BLI_assert */ -#include "BLI_math.h" #include "BKE_ccg.h" #include "CCGSubSurf.h" diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 2810daf5019..10ceee487fb 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -56,11 +56,8 @@ #include "BKE_constraint.h" #include "BKE_deform.h" #include "BKE_fcurve.h" -#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 1eea203f078..9c9736d9bc5 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -47,9 +47,7 @@ #include "BKE_anim.h" #include "BKE_animsys.h" #include "BKE_action.h" -#include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_global.h" #include "BKE_key.h" #include "BKE_main.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 490b6bbcf34..f5916283653 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -64,8 +64,6 @@ #include "BKE_displist.h" #include "BKE_idprop.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_lattice.h" #include "BKE_main.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index e155c14ce4a..989e5a74085 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -52,7 +52,6 @@ #include "BIK_api.h" -#include "BKE_main.h" #include "DEG_depsgraph.h" diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 0ba19d5b4da..f109d431df1 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -52,12 +52,10 @@ #include "BKE_blendfile.h" #include "BKE_brush.h" #include "BKE_cachefile.h" -#include "BKE_context.h" #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_report.h" diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index 004aaf2801c..a0bdbef4e84 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -36,7 +36,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLI_callbacks.h" #include "IMB_imbuf.h" #include "IMB_moviecache.h" diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index fac3685f7b1..32e2ca94fed 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -51,7 +51,6 @@ #include "BKE_blendfile.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BLO_undofile.h" diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index bb42f7412e6..a7066dd9c47 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -32,13 +32,11 @@ #include "DNA_gpencil_types.h" #include "BLI_math.h" -#include "BLI_blenlib.h" #include "BLI_rand.h" #include "BKE_brush.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_library_remap.h" diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 7cf16b2b772..eb4f670da30 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -50,8 +50,6 @@ #include "BKE_object.h" #include "BKE_layer.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_scene.h" #include "BKE_screen.h" diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 1c3b75b1771..03534d8bbea 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -37,13 +37,10 @@ #include "atomic_ops.h" #include "BLI_math.h" -#include "BLI_edgehash.h" #include "BLI_utildefines.h" -#include "BLI_utildefines_stack.h" #include "BKE_pbvh.h" #include "BKE_cdderivedmesh.h" -#include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 5f4d57d9c5c..2f8748e7d1a 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -33,7 +33,6 @@ #include "BLI_math_base.h" #include "BLI_threads.h" #include "BLT_translation.h" -#include "BLI_string_utils.h" #include "BKE_collection.h" #include "BKE_icons.h" diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 900c5c27024..782f6c94fea 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -55,11 +55,8 @@ #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_font.h" -#include "BKE_global.h" #include "BKE_key.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_object.h" #include "BKE_material.h" diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 1fbeaf67596..54ed69fecf9 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -52,8 +52,6 @@ #include "BKE_customdata.h" #include "BKE_customdata_file.h" -#include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 9ee27a29c8b..e3230076022 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -37,12 +37,10 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_array.h" #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_data_transfer.h" #include "BKE_deform.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index c5c503966c4..b9d451085b8 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -48,12 +48,10 @@ #include "BLI_scanfill.h" #include "BLI_utildefines.h" -#include "BKE_global.h" #include "BKE_displist.h" #include "BKE_cdderivedmesh.h" #include "BKE_object.h" #include "BKE_library.h" -#include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mball_tessellate.h" #include "BKE_mesh.h" diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 094f13d066c..2cb9bd5c619 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -63,7 +63,6 @@ #include "BKE_deform.h" #include "BKE_dynamicpaint.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_image.h" #include "BKE_library.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/editmesh_cache.c b/source/blender/blenkernel/intern/editmesh_cache.c index 09bf7e9b39b..2cae2204c78 100644 --- a/source/blender/blenkernel/intern/editmesh_cache.c +++ b/source/blender/blenkernel/intern/editmesh_cache.c @@ -28,7 +28,6 @@ #include "DNA_mesh_types.h" -#include "BLI_math.h" #include "BKE_editmesh.h" #include "BKE_editmesh_cache.h" /* own include */ diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 0c8a47be4b4..453d1e70309 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -66,7 +66,6 @@ #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_layer.h" -#include "BKE_library.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_particle.h" diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 2f0c70a4e12..8ac3c840680 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -29,8 +29,6 @@ * \ingroup bke */ - - #include <math.h> #include <stdio.h> #include <stddef.h> diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 3d1208b43de..38a3a9aad54 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -39,10 +39,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" #include "BLI_math_vector.h" -#include "BLI_math_color.h" #include "BLI_string_utils.h" -#include "BLI_rand.h" -#include "BLI_ghash.h" #include "BLT_translation.h" @@ -54,11 +51,9 @@ #include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "BKE_context.h" #include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_deform.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_colortools.h" #include "BKE_icons.h" diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index 9d45bfd0649..7fd949cb645 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -45,7 +45,6 @@ #include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_gpencil.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 550edce31e0..e4ed92d9eaa 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -74,8 +74,6 @@ #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 599d0989250..fb892f878b5 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -55,7 +55,6 @@ #include "BKE_curve.h" #include "BKE_customdata.h" #include "BKE_deform.h" -#include "BKE_global.h" #include "BKE_key.h" #include "BKE_lattice.h" #include "BKE_library.h" @@ -64,7 +63,6 @@ #include "BKE_editmesh.h" #include "BKE_scene.h" - #include "RNA_access.h" #define KEY_MODE_DUMMY 0 /* use where mode isn't checked for */ diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index ff79185d2b4..4730486c2ba 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -49,8 +49,6 @@ #include "BKE_icons.h" #include "BKE_lamp.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 02cec8b692e..6464fb0c1fb 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -57,8 +57,6 @@ #include "BKE_key.h" #include "BKE_lattice.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 304702ce475..f6628e0d634 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -26,7 +26,6 @@ #include <string.h> -#include "BLI_array.h" #include "BLI_listbase.h" #include "BLI_string.h" #include "BLI_string_utf8.h" @@ -37,7 +36,6 @@ #include "BKE_animsys.h" #include "BKE_collection.h" #include "BKE_freestyle.h" -#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_layer.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c index fb25ca3ece4..fcb4dc07814 100644 --- a/source/blender/blenkernel/intern/layer_utils.c +++ b/source/blender/blenkernel/intern/layer_utils.c @@ -25,7 +25,6 @@ #include <string.h> #include "BLI_array.h" -#include "BLI_listbase.h" #include "BKE_collection.h" #include "BKE_editmesh.h" diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index e6c99e6a57b..957004c496f 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -78,9 +78,7 @@ #include "BLI_ghash.h" #include "BLI_linklist.h" #include "BLI_memarena.h" -#include "BLI_mempool.h" #include "BLI_string_utils.h" -#include "BLI_threads.h" #include "BLT_translation.h" @@ -104,7 +102,6 @@ #include "BKE_lamp.h" #include "BKE_lattice.h" #include "BKE_library.h" -#include "BKE_library_override.h" #include "BKE_library_query.h" #include "BKE_library_remap.h" #include "BKE_linestyle.h" diff --git a/source/blender/blenkernel/intern/library_idmap.c b/source/blender/blenkernel/intern/library_idmap.c index 1cc13b39a97..b3eb1f33f6a 100644 --- a/source/blender/blenkernel/intern/library_idmap.c +++ b/source/blender/blenkernel/intern/library_idmap.c @@ -30,7 +30,6 @@ #include "DNA_ID.h" #include "BKE_idcode.h" -#include "BKE_library.h" #include "BKE_library_idmap.h" /* own include */ #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index cec5f275ebe..32800b67836 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -64,7 +64,6 @@ #include "DNA_world_types.h" #include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_ghash.h" #include "BLI_linklist_stack.h" diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c index 5017827ea9c..1a764091446 100644 --- a/source/blender/blenkernel/intern/lightprobe.c +++ b/source/blender/blenkernel/intern/lightprobe.c @@ -32,11 +32,9 @@ #include "DNA_object_types.h" #include "DNA_lightprobe_types.h" -#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_animsys.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_lightprobe.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index a23b192af4d..58bcedec2b2 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -53,19 +53,15 @@ #include "BLI_math.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLI_string.h" #include "BLI_array_utils.h" #include "BKE_animsys.h" #include "BKE_brush.h" #include "BKE_displist.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 5ce080fd4c2..ef641c87462 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -52,15 +52,12 @@ #include "BLI_string_utils.h" #include "BLI_utildefines.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_animsys.h" #include "BKE_curve.h" #include "BKE_scene.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_displist.h" #include "BKE_mball.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c index 5525c41c9dd..2024f3cc82c 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.c +++ b/source/blender/blenkernel/intern/mball_tessellate.c @@ -49,7 +49,6 @@ #include "BKE_global.h" #include "BKE_displist.h" -#include "BKE_main.h" #include "BKE_mball_tessellate.h" /* own include */ #include "BKE_scene.h" diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 659177654d6..4d26054560d 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -40,7 +40,6 @@ #include "BKE_main.h" #include "BKE_DerivedMesh.h" -#include "BKE_global.h" #include "BKE_key.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index b871b67527b..192d12fd25f 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -39,7 +39,6 @@ #include "BLI_utildefines.h" #include "BLI_memarena.h" -#include "BLI_mempool.h" #include "BLI_math.h" #include "BLI_edgehash.h" #include "BLI_bitmap.h" diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c index a222c681a5e..dff7bbf4b4b 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.c +++ b/source/blender/blenkernel/intern/mesh_tangent.c @@ -38,11 +38,9 @@ #include "BLI_utildefines.h" #include "BLI_math.h" -#include "BLI_stack.h" #include "BLI_task.h" #include "BKE_customdata.h" -#include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_mesh_tangent.h" #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 7d279342093..738b9e50e96 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -62,7 +62,6 @@ #include "BKE_animsys.h" #include "BKE_colortools.h" #include "BKE_library.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_movieclip.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index f0c0046db1f..ddd76e2463b 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -49,7 +49,6 @@ #include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" -#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenkernel/intern/multires_subdiv.c b/source/blender/blenkernel/intern/multires_subdiv.c index 150e7192934..1afc497f611 100644 --- a/source/blender/blenkernel/intern/multires_subdiv.c +++ b/source/blender/blenkernel/intern/multires_subdiv.c @@ -34,7 +34,6 @@ #include "BLI_utildefines.h" -#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_multires.h" diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 5634d23727a..ef265f873f4 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -59,8 +59,6 @@ #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/object_facemap.c b/source/blender/blenkernel/intern/object_facemap.c index ef254864d2e..865246ec7e4 100644 --- a/source/blender/blenkernel/intern/object_facemap.c +++ b/source/blender/blenkernel/intern/object_facemap.c @@ -35,12 +35,10 @@ #include "DNA_mesh_types.h" #include "BLI_utildefines.h" -#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utils.h" #include "BLI_listbase.h" -#include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index a159e713d01..c44a45e67eb 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -48,13 +48,10 @@ #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_lamp.h" #include "BKE_lattice.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_material.h" #include "BKE_mball.h" #include "BKE_mesh.h" diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index adbe1a7f889..09a5cac48a1 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -39,11 +39,6 @@ #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" -#include "BLI_path_util.h" -#include "BLI_rand.h" -#include "BLI_task.h" -#include "BLI_threads.h" #include "BLI_utildefines.h" #include "BKE_image.h" diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 0446b697c68..dce15a6dba1 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -52,9 +52,7 @@ #include "BLI_utildefines.h" #include "BKE_font.h" -#include "BKE_global.h" #include "BKE_image.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index ae5455c1a6d..42f460ae679 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -45,9 +45,7 @@ #include "DNA_workspace_types.h" #include "BLI_bitmap.h" -#include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLI_string_utils.h" #include "BLI_math_vector.h" #include "BLI_listbase.h" @@ -61,7 +59,6 @@ #include "BKE_main.h" #include "BKE_context.h" #include "BKE_crazyspace.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_image.h" #include "BKE_key.h" diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 3b61c47cb43..8800d9cc4ae 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -48,7 +48,6 @@ #include "DNA_dynamicpaint_types.h" #include "BLI_blenlib.h" -#include "BLI_noise.h" #include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_kdopbvh.h" @@ -68,7 +67,6 @@ #include "BKE_collection.h" #include "BKE_colortools.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_lattice.h" @@ -77,8 +75,6 @@ #include "BKE_material.h" #include "BKE_key.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_modifier.h" #include "BKE_mesh.h" #include "BKE_cdderivedmesh.h" /* for weight_to_rgb() */ diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index bed03858db8..59eb431b44b 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -58,12 +58,10 @@ #include "BLI_utildefines.h" #include "BLI_edgehash.h" #include "BLI_rand.h" -#include "BLI_jitter_2d.h" #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_kdtree.h" #include "BLI_kdopbvh.h" -#include "BLI_sort.h" #include "BLI_task.h" #include "BLI_threads.h" #include "BLI_linklist.h" @@ -73,10 +71,8 @@ #include "BKE_collision.h" #include "BKE_colortools.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" -#include "BKE_main.h" #include "BKE_particle.h" #include "BKE_collection.h" diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 413f0407c86..1bb4041e84f 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -36,7 +36,6 @@ #include "BKE_ccg.h" #include "BKE_subsurf.h" #include "BKE_DerivedMesh.h" -#include "BKE_global.h" #include "BKE_mesh.h" /* for BKE_mesh_calc_normals */ #include "BKE_paint.h" diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 4419485c4c4..10f6cfc4fec 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -48,7 +48,6 @@ #include "DNA_smoke_types.h" #include "BLI_blenlib.h" -#include "BLI_threads.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index 4e6d6cf0971..67e0834e088 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -39,7 +39,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #ifdef WITH_BULLET @@ -57,10 +56,7 @@ #include "BKE_collection.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_layer.h" -#include "BKE_library.h" -#include "BKE_library_query.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" @@ -68,6 +64,11 @@ #include "BKE_pointcache.h" #include "BKE_rigidbody.h" #include "BKE_scene.h" +#ifdef WITH_BULLET +# include "BKE_global.h" +# include "BKE_library.h" +# include "BKE_library_query.h" +#endif #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index f266a839c52..126a4dfed47 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -73,7 +73,6 @@ #include "BKE_editmesh.h" #include "BKE_fcurve.h" #include "BKE_freestyle.h" -#include "BKE_global.h" #include "BKE_gpencil.h" #include "BKE_icons.h" #include "BKE_idprop.h" diff --git a/source/blender/blenkernel/intern/shader_fx.c b/source/blender/blenkernel/intern/shader_fx.c index f19b450dece..31161d8d00a 100644 --- a/source/blender/blenkernel/intern/shader_fx.c +++ b/source/blender/blenkernel/intern/shader_fx.c @@ -45,7 +45,6 @@ #include "DNA_gpencil_types.h" #include "DNA_shader_fx_types.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_library_query.h" #include "BKE_gpencil.h" diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 2d404347cee..d45935e0faa 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -42,12 +42,9 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_kdtree.h" #include "BLI_kdopbvh.h" -#include "BLI_task.h" #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BLI_voxel.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" @@ -72,9 +69,7 @@ #include "BKE_customdata.h" #include "BKE_deform.h" #include "BKE_effect.h" -#include "BKE_global.h" #include "BKE_library.h" -#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" @@ -105,6 +100,10 @@ #ifdef WITH_SMOKE +#include "BLI_task.h" +#include "BLI_kdtree.h" +#include "BLI_voxel.h" + static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER; struct Mesh; diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index 7c92844ac2e..2b27bb92ec4 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -33,8 +33,6 @@ #include "BKE_animsys.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_speaker.h" diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index ca02fcef746..3f8bcea2147 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -43,7 +43,6 @@ #include "BLI_math.h" #include "BLI_math_color.h" #include "BLI_path_util.h" -#include "BLI_rand.h" #include "BLI_string.h" #include "BLI_string_utils.h" diff --git a/source/blender/blenkernel/intern/subdiv_ccg_mask.c b/source/blender/blenkernel/intern/subdiv_ccg_mask.c index 0da30fb1bf0..2acb1bffb68 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg_mask.c +++ b/source/blender/blenkernel/intern/subdiv_ccg_mask.c @@ -35,7 +35,6 @@ #include "DNA_object_types.h" #include "BLI_utildefines.h" -#include "BLI_math_vector.h" #include "BKE_customdata.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c index 0dad259b001..9389aef2545 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c @@ -36,7 +36,6 @@ #include "BLI_utildefines.h" #include "BLI_bitmap.h" -#include "BLI_math_vector.h" #include "BKE_customdata.h" #include "BKE_mesh_mapping.h" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c index 7cb539c6c9e..30116aeb65c 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.c +++ b/source/blender/blenkernel/intern/subdiv_foreach.c @@ -35,9 +35,7 @@ #include "DNA_meshdata_types.h" #include "DNA_key_types.h" -#include "BLI_alloca.h" #include "BLI_bitmap.h" -#include "BLI_math_vector.h" #include "BLI_task.h" #include "BKE_mesh.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index d45c6bad55d..b42b34df058 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -36,9 +36,7 @@ #include "DNA_key_types.h" #include "BLI_alloca.h" -#include "BLI_bitmap.h" #include "BLI_math_vector.h" -#include "BLI_task.h" #include "BKE_mesh.h" #include "BKE_key.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index b1c4102df83..4921183c177 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -64,7 +64,6 @@ #include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_cdderivedmesh.h" -#include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_modifier.h" diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 39388ebeb4f..979358b8159 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -56,7 +56,6 @@ #include "DNA_node_types.h" #include "DNA_material_types.h" -#include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_text.h" diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 3d180bd7856..6cecb402bfa 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -57,8 +57,6 @@ #include "BKE_colorband.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_image.h" #include "BKE_material.h" #include "BKE_texture.h" diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index 12cd8fc43e9..25eaf4cb7ab 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -32,14 +32,12 @@ #include "BLI_sys_types.h" #include "BLI_listbase.h" #include "BLI_string.h" -#include "BLI_sort_utils.h" #include "DNA_listBase.h" #include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_library_override.h" #include "BKE_main.h" #include "BKE_undo_system.h" diff --git a/source/blender/blenkernel/intern/workspace.c b/source/blender/blenkernel/intern/workspace.c index dca89a42c49..35cce1b04f4 100644 --- a/source/blender/blenkernel/intern/workspace.c +++ b/source/blender/blenkernel/intern/workspace.c @@ -30,16 +30,13 @@ #include "BLI_utildefines.h" #include "BLI_string.h" -#include "BLI_string_utf8.h" #include "BLI_string_utils.h" #include "BLI_listbase.h" -#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_scene.h" -#include "BKE_screen.h" #include "BKE_object.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 319bc3532c2..b084e76ee78 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -44,11 +44,8 @@ #include "BLI_listbase.h" #include "BKE_animsys.h" -#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_library.h" -#include "BKE_library_query.h" -#include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_world.h" diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index a1732b79ea3..cad4b6d2e79 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -39,13 +39,14 @@ #include "DNA_scene_types.h" -#include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BKE_global.h" -#include "BKE_library.h" -#include "BKE_main.h" #include "BKE_report.h" +#ifdef WITH_AVI +# include "BLI_blenlib.h" + +# include "BKE_main.h" +#endif #include "BKE_writeavi.h" |