diff --git a/source/blender/sequencer/intern/animation.cc b/source/blender/sequencer/intern/animation.cc index 1174d93665e..985535b7fcf 100644 --- a/source/blender/sequencer/intern/animation.cc +++ b/source/blender/sequencer/intern/animation.cc @@ -12,7 +12,6 @@ #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "BKE_animsys.h" #include "BKE_fcurve.h" #include "BLI_ghash.h" diff --git a/source/blender/sequencer/intern/channels.cc b/source/blender/sequencer/intern/channels.cc index 851854c1d5e..55fa661a1e6 100644 --- a/source/blender/sequencer/intern/channels.cc +++ b/source/blender/sequencer/intern/channels.cc @@ -11,15 +11,11 @@ #include "MEM_guardedalloc.h" #include "DNA_listBase.h" -#include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "BLI_blenlib.h" #include "SEQ_channels.hh" -#include "SEQ_iterator.hh" -#include "SEQ_relations.hh" -#include "SEQ_sequencer.hh" ListBase *SEQ_channels_displayed_get(Editing *ed) { diff --git a/source/blender/sequencer/intern/disk_cache.cc b/source/blender/sequencer/intern/disk_cache.cc index 0d4a8d42517..3eccdc03038 100644 --- a/source/blender/sequencer/intern/disk_cache.cc +++ b/source/blender/sequencer/intern/disk_cache.cc @@ -14,7 +14,6 @@ #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "DNA_space_types.h" /* for FILE_MAX. */ #include "IMB_colormanagement.hh" #include "IMB_imbuf.hh" @@ -25,25 +24,17 @@ #include "BLI_endian_switch.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" -#include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_mempool.h" #include "BLI_path_util.h" #include "BLI_threads.h" #include "BKE_main.hh" -#include "BKE_scene.hh" -#include "SEQ_prefetch.hh" -#include "SEQ_relations.hh" #include "SEQ_render.hh" -#include "SEQ_sequencer.hh" #include "SEQ_time.hh" #include "disk_cache.hh" #include "image_cache.hh" -#include "prefetch.hh" -#include "strip_time.hh" /** * Disk Cache Design Notes diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc index 5df6db47de7..563ed818816 100644 --- a/source/blender/sequencer/intern/effects.cc +++ b/source/blender/sequencer/intern/effects.cc @@ -15,7 +15,6 @@ #include "MEM_guardedalloc.h" #include "BLI_array.hh" -#include "BLI_listbase.h" #include "BLI_math_rotation.h" #include "BLI_math_vector.hh" #include "BLI_math_vector_types.hh" @@ -26,7 +25,6 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "DNA_anim_types.h" #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" @@ -45,7 +43,6 @@ #include "BLI_math_color_blend.h" -#include "RNA_access.hh" #include "RNA_prototypes.h" #include "RE_pipeline.h" @@ -62,8 +59,6 @@ #include "effects.hh" #include "render.hh" -#include "strip_time.hh" -#include "utils.hh" using namespace blender; diff --git a/source/blender/sequencer/intern/image_cache.cc b/source/blender/sequencer/intern/image_cache.cc index 0adffbb5cc6..5a8173096f5 100644 --- a/source/blender/sequencer/intern/image_cache.cc +++ b/source/blender/sequencer/intern/image_cache.cc @@ -19,30 +19,21 @@ #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" -#include "BLI_blenlib.h" -#include "BLI_endian_defines.h" -#include "BLI_endian_switch.h" -#include "BLI_fileops.h" #include "BLI_fileops_types.h" #include "BLI_ghash.h" -#include "BLI_listbase.h" #include "BLI_mempool.h" -#include "BLI_path_util.h" #include "BLI_threads.h" #include "BKE_main.hh" -#include "BKE_scene.hh" #include "SEQ_prefetch.hh" #include "SEQ_relations.hh" #include "SEQ_render.hh" -#include "SEQ_sequencer.hh" #include "SEQ_time.hh" #include "disk_cache.hh" #include "image_cache.hh" #include "prefetch.hh" -#include "strip_time.hh" /** * Sequencer Cache Design Notes diff --git a/source/blender/sequencer/intern/iterator.cc b/source/blender/sequencer/intern/iterator.cc index b6c704b9740..b5c89e8708b 100644 --- a/source/blender/sequencer/intern/iterator.cc +++ b/source/blender/sequencer/intern/iterator.cc @@ -12,20 +12,14 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "BLI_ghash.h" #include "BLI_listbase.h" -#include "BLI_set.hh" - -#include "BKE_scene.hh" #include "SEQ_iterator.hh" #include "SEQ_relations.hh" #include "SEQ_render.hh" #include "SEQ_time.hh" -#include "render.hh" using blender::VectorSet; diff --git a/source/blender/sequencer/intern/prefetch.cc b/source/blender/sequencer/intern/prefetch.cc index cb0ccde167f..5b6b256d1b2 100644 --- a/source/blender/sequencer/intern/prefetch.cc +++ b/source/blender/sequencer/intern/prefetch.cc @@ -12,11 +12,9 @@ #include "MEM_guardedalloc.h" -#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sequence_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_listbase.h" #include "BLI_threads.h" @@ -26,12 +24,9 @@ #include "BKE_anim_data.h" #include "BKE_animsys.h" -#include "BKE_context.hh" #include "BKE_global.hh" #include "BKE_layer.hh" -#include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_scene.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/sequencer/intern/proxy.cc b/source/blender/sequencer/intern/proxy.cc index f4d1dc6d7d7..fe771f3c9fd 100644 --- a/source/blender/sequencer/intern/proxy.cc +++ b/source/blender/sequencer/intern/proxy.cc @@ -10,7 +10,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_anim_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "DNA_space_types.h" @@ -18,7 +17,6 @@ #include "BLI_fileops.h" #include "BLI_listbase.h" #include "BLI_path_util.h" -#include "BLI_session_uid.h" #include "BLI_string.h" #ifdef WIN32 @@ -32,15 +30,12 @@ #include "BKE_main.hh" #include "BKE_scene.hh" -#include "DEG_depsgraph.hh" - #include "WM_types.hh" #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" #include "IMB_metadata.hh" -#include "SEQ_iterator.hh" #include "SEQ_proxy.hh" #include "SEQ_relations.hh" #include "SEQ_render.hh" @@ -51,7 +46,6 @@ #include "proxy.hh" #include "render.hh" #include "sequencer.hh" -#include "strip_time.hh" #include "utils.hh" struct SeqIndexBuildContext { diff --git a/source/blender/sequencer/intern/proxy_job.cc b/source/blender/sequencer/intern/proxy_job.cc index 96bf9ef1c8b..54a1aac1235 100644 --- a/source/blender/sequencer/intern/proxy_job.cc +++ b/source/blender/sequencer/intern/proxy_job.cc @@ -10,19 +10,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_ghash.h" -#include "BLI_timecode.h" - #include "DNA_scene_types.h" #include "DNA_sequence_types.h" #include "BKE_context.hh" -#include "BKE_global.hh" -#include "BKE_main.hh" -#include "BKE_report.hh" -#include "SEQ_iterator.hh" #include "SEQ_proxy.hh" #include "SEQ_relations.hh" #include "SEQ_sequencer.hh" @@ -30,8 +22,6 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "RNA_define.hh" - static void proxy_freejob(void *pjv) { ProxyJob *pj = static_cast(pjv); diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index 89ca82d6977..46cbd67b2f8 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -12,7 +12,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_anim_types.h" #include "DNA_defaults.h" #include "DNA_mask_types.h" #include "DNA_scene_types.h" @@ -48,7 +47,6 @@ #include "IMB_imbuf_types.hh" #include "IMB_metadata.hh" -#include "RNA_access.hh" #include "RNA_prototypes.h" #include "RE_engine.h" @@ -72,7 +70,6 @@ #include "prefetch.hh" #include "proxy.hh" #include "render.hh" -#include "strip_time.hh" #include "utils.hh" #include diff --git a/source/blender/sequencer/intern/sequence_lookup.cc b/source/blender/sequencer/intern/sequence_lookup.cc index 3ddc4129426..4fca9d97e62 100644 --- a/source/blender/sequencer/intern/sequence_lookup.cc +++ b/source/blender/sequencer/intern/sequence_lookup.cc @@ -13,12 +13,9 @@ #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "SEQ_iterator.hh" - #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_map.hh" -#include "BLI_string.h" #include "BLI_sys_types.h" #include "BLI_threads.h" #include "BLI_vector_set.hh" diff --git a/source/blender/sequencer/intern/sound.cc b/source/blender/sequencer/intern/sound.cc index 6a9300f855d..c76d4716a45 100644 --- a/source/blender/sequencer/intern/sound.cc +++ b/source/blender/sequencer/intern/sound.cc @@ -22,11 +22,7 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BLO_read_write.hh" - #include "BKE_colortools.hh" -#include "BKE_main.hh" -#include "BKE_scene.hh" #include "BKE_sound.h" #ifdef WITH_CONVOLUTION diff --git a/source/blender/sequencer/intern/strip_add.cc b/source/blender/sequencer/intern/strip_add.cc index 8df7d7ef491..d2b749465cd 100644 --- a/source/blender/sequencer/intern/strip_add.cc +++ b/source/blender/sequencer/intern/strip_add.cc @@ -22,9 +22,7 @@ #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BLI_string_utf8.h" -#include "BKE_context.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" @@ -45,7 +43,6 @@ #include "SEQ_effects.hh" #include "SEQ_relations.hh" #include "SEQ_render.hh" -#include "SEQ_select.hh" #include "SEQ_sequencer.hh" #include "SEQ_time.hh" #include "SEQ_transform.hh" @@ -55,7 +52,6 @@ #include "proxy.hh" #include "sequencer.hh" #include "strip_time.hh" -#include "utils.hh" void SEQ_add_load_data_init(SeqLoadData *load_data, const char *name, diff --git a/source/blender/sequencer/intern/strip_edit.cc b/source/blender/sequencer/intern/strip_edit.cc index e1f91080171..4a2fc80db80 100644 --- a/source/blender/sequencer/intern/strip_edit.cc +++ b/source/blender/sequencer/intern/strip_edit.cc @@ -18,13 +18,9 @@ #include "BLT_translation.hh" -#include "BKE_main.hh" -#include "BKE_movieclip.h" -#include "BKE_scene.hh" #include "BKE_sound.h" #include "strip_time.hh" -#include "utils.hh" #include "SEQ_add.hh" #include "SEQ_animation.hh" diff --git a/source/blender/sequencer/intern/strip_relations.cc b/source/blender/sequencer/intern/strip_relations.cc index 460291e7160..a5ca653b80c 100644 --- a/source/blender/sequencer/intern/strip_relations.cc +++ b/source/blender/sequencer/intern/strip_relations.cc @@ -18,10 +18,8 @@ #include "BKE_main.hh" #include "BKE_report.hh" -#include "BKE_scene.hh" #include "DEG_depsgraph.hh" -#include "DEG_depsgraph_query.hh" #include "IMB_imbuf.hh" @@ -30,7 +28,6 @@ #include "SEQ_relations.hh" #include "SEQ_sequencer.hh" #include "SEQ_time.hh" -#include "SEQ_transform.hh" #include "effects.hh" #include "image_cache.hh" diff --git a/source/blender/sequencer/intern/strip_retiming.cc b/source/blender/sequencer/intern/strip_retiming.cc index 2817e063dff..3a063e300f6 100644 --- a/source/blender/sequencer/intern/strip_retiming.cc +++ b/source/blender/sequencer/intern/strip_retiming.cc @@ -18,30 +18,14 @@ #include "BLI_span.hh" #include "BLI_vector.hh" -#include "BKE_fcurve.h" -#include "BKE_movieclip.h" -#include "BKE_scene.hh" #include "BKE_sound.h" -#include "DNA_anim_types.h" -#include "DNA_sound_types.h" - -#include "IMB_imbuf.hh" - -#include "RNA_prototypes.h" - -#include "SEQ_channels.hh" -#include "SEQ_iterator.hh" -#include "SEQ_relations.hh" -#include "SEQ_render.hh" #include "SEQ_retiming.hh" #include "SEQ_sequencer.hh" #include "SEQ_time.hh" -#include "SEQ_transform.hh" #include "sequencer.hh" #include "strip_time.hh" -#include "utils.hh" using blender::MutableSpan; diff --git a/source/blender/sequencer/intern/strip_select.cc b/source/blender/sequencer/intern/strip_select.cc index b3a13099ccb..808511a00b0 100644 --- a/source/blender/sequencer/intern/strip_select.cc +++ b/source/blender/sequencer/intern/strip_select.cc @@ -11,8 +11,6 @@ #include "DNA_scene_types.h" #include "DNA_sequence_types.h" -#include "BKE_scene.hh" - #include "SEQ_select.hh" #include "SEQ_sequencer.hh" diff --git a/source/blender/sequencer/intern/strip_time.cc b/source/blender/sequencer/intern/strip_time.cc index 5ea5d186180..a566e5acf17 100644 --- a/source/blender/sequencer/intern/strip_time.cc +++ b/source/blender/sequencer/intern/strip_time.cc @@ -16,21 +16,15 @@ #include "BLI_listbase.h" #include "BLI_math_base.h" -#include "BKE_fcurve.h" #include "BKE_movieclip.h" -#include "BKE_scene.hh" #include "BKE_sound.h" -#include "DNA_anim_types.h" #include "DNA_sound_types.h" #include "IMB_imbuf.hh" -#include "RNA_prototypes.h" - #include "SEQ_channels.hh" #include "SEQ_iterator.hh" -#include "SEQ_relations.hh" #include "SEQ_render.hh" #include "SEQ_retiming.hh" #include "SEQ_sequencer.hh" diff --git a/source/blender/sequencer/intern/strip_transform.cc b/source/blender/sequencer/intern/strip_transform.cc index 2d7973557f0..0edc52a8ae0 100644 --- a/source/blender/sequencer/intern/strip_transform.cc +++ b/source/blender/sequencer/intern/strip_transform.cc @@ -17,10 +17,6 @@ #include "BLI_math_vector.h" #include "BLI_math_vector_types.hh" -#include "BKE_main.hh" -#include "BKE_scene.hh" -#include "BKE_sound.h" - #include "SEQ_animation.hh" #include "SEQ_channels.hh" #include "SEQ_edit.hh" @@ -34,8 +30,6 @@ #include "sequencer.hh" #include "strip_time.hh" -#include "CLG_log.h" - bool SEQ_transform_single_image_check(Sequence *seq) { return (seq->flag & SEQ_SINGLE_FRAME_CONTENT) != 0; diff --git a/source/blender/sequencer/intern/utils.cc b/source/blender/sequencer/intern/utils.cc index 457f533db5f..456e2a0c2f8 100644 --- a/source/blender/sequencer/intern/utils.cc +++ b/source/blender/sequencer/intern/utils.cc @@ -14,7 +14,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mask_types.h" #include "DNA_scene_types.h" #include "DNA_sequence_types.h" @@ -28,7 +27,6 @@ #include "BKE_main.hh" #include "BKE_scene.hh" -#include "SEQ_animation.hh" #include "SEQ_channels.hh" #include "SEQ_edit.hh" #include "SEQ_iterator.hh"