[Bf-blender-cvs] [ea1c5a6c15d] master: Rename BKE_sequencer.h
Richard Antalik
noreply at git.blender.org
Sun Nov 1 21:14:44 CET 2020
Commit: ea1c5a6c15d956639dde8445d79b7f8abe7983fd
Author: Richard Antalik
Date: Sun Nov 1 21:03:31 2020 +0100
Branches: master
https://developer.blender.org/rBea1c5a6c15d956639dde8445d79b7f8abe7983fd
Rename BKE_sequencer.h
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D9349
===================================================================
M source/blender/blenkernel/intern/blender.c
M source/blender/blenkernel/intern/bpath.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_ops.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_sync.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_sequencer/sequencer_modifier.c
M source/blender/editors/space_sequencer/sequencer_ops.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/util/ed_util_imbuf.c
M source/blender/imbuf/intern/colormanagement.c
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_curveprofile.c
M source/blender/makesrna/intern/rna_movieclip.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_sound.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/render/intern/source/pipeline.c
M source/blender/sequencer/CMakeLists.txt
R100 source/blender/sequencer/BKE_sequencer.h source/blender/sequencer/SEQ_sequencer.h
M source/blender/sequencer/intern/effects.c
M source/blender/sequencer/intern/image_cache.c
M source/blender/sequencer/intern/modifier.c
M source/blender/sequencer/intern/prefetch.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/blender/windowmanager/intern/wm_jobs.c
===================================================================
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 1ad1a821129..897552723ee 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -53,7 +53,6 @@
#include "BKE_report.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_studiolight.h"
#include "DEG_depsgraph.h"
@@ -61,6 +60,8 @@
#include "RE_pipeline.h"
#include "RE_render_ext.h"
+#include "SEQ_sequencer.h"
+
#include "BLF_api.h"
Global G;
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index 4ea9a26f0f8..f624d0ae057 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -73,12 +73,13 @@
#include "BKE_main.h"
#include "BKE_node.h"
#include "BKE_report.h"
-#include "BKE_sequencer.h"
#include "BKE_bpath.h" /* own include */
#include "CLG_log.h"
+#include "SEQ_sequencer.h"
+
#ifndef _MSC_VER
# include "BLI_strict_flags.h"
#endif
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 187908573dd..cadd442ad9e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -84,7 +84,6 @@
#include "BKE_packedFile.h"
#include "BKE_report.h"
#include "BKE_scene.h"
-#include "BKE_sequencer.h" /* seq_foreground_frame_get() */
#include "BKE_workspace.h"
#include "BLF_api.h"
@@ -93,6 +92,8 @@
#include "RE_pipeline.h"
+#include "SEQ_sequencer.h" /* seq_foreground_frame_get() */
+
#include "GPU_texture.h"
#include "BLI_sys_types.h" /* for intptr_t support */
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 1a87b931689..c09c5bf5cda 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -68,12 +68,13 @@
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_nla.h"
-#include "BKE_sequencer.h"
#include "CLG_log.h"
#include "MEM_guardedalloc.h"
+#include "SEQ_sequencer.h"
+
#ifdef WIN32
# include "BLI_math_base.h" /* M_PI */
#endif
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 398860b6796..6bfee0194b0 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -123,7 +123,6 @@
#include "BKE_pointcloud.h"
#include "BKE_rigidbody.h"
#include "BKE_scene.h"
-#include "BKE_sequencer.h"
#include "BKE_shader_fx.h"
#include "BKE_softbody.h"
#include "BKE_speaker.h"
@@ -136,6 +135,8 @@
#include "DRW_engine.h"
+#include "SEQ_sequencer.h"
+
#ifdef WITH_PYTHON
# include "BPY_extern.h"
#endif
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 416f5aa7edd..6a9fe4615f7 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -90,7 +90,6 @@
#include "BKE_rigidbody.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_sound.h"
#include "BKE_unit.h"
#include "BKE_workspace.h"
@@ -103,6 +102,8 @@
#include "RE_engine.h"
+#include "SEQ_sequencer.h"
+
#include "engines/eevee/eevee_lightcache.h"
#include "PIL_time.h"
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 8bec9f331c5..2ee48a13454 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -60,7 +60,6 @@
#include "BKE_main.h"
#include "BKE_packedFile.h"
#include "BKE_scene.h"
-#include "BKE_sequencer.h"
#include "BKE_sound.h"
#include "DEG_depsgraph.h"
@@ -68,6 +67,8 @@
#include "BLO_read_write.h"
+#include "SEQ_sequencer.h"
+
static void sound_free_audio(bSound *sound);
static void sound_copy_data(Main *UNUSED(bmain),
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 29ed66c5080..5d63456cfab 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -156,7 +156,6 @@
#include "BKE_report.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_shader_fx.h"
#include "BKE_simulation.h"
#include "BKE_sound.h"
@@ -177,6 +176,8 @@
#include "RE_engine.h"
+#include "SEQ_sequencer.h"
+
#include "engines/eevee/eevee_lightcache.h"
#include "readfile.h"
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 1988b2e1f33..83cd5dfb6f3 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -73,10 +73,11 @@
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_sound.h"
#include "BKE_texture.h"
+#include "SEQ_sequencer.h"
+
#include "NOD_socket.h"
#include "BLO_readfile.h"
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index a7c5d7b933c..6642749d907 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -61,11 +61,12 @@
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_text.h" /* for txt_extended_ascii_as_utf8 */
#include "BKE_texture.h"
#include "BKE_tracking.h"
+#include "SEQ_sequencer.h"
+
#ifdef WITH_FFMPEG
# include "BKE_writeffmpeg.h"
#endif
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 2452ac43bd4..41e46f8f0a0 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -63,9 +63,10 @@
#include "BKE_node.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_tracking.h"
+#include "SEQ_sequencer.h"
+
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_string.h"
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 8e082f1c0f9..472400998b1 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -93,11 +93,12 @@
#include "BKE_report.h"
#include "BKE_rigidbody.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_studiolight.h"
#include "BKE_unit.h"
#include "BKE_workspace.h"
+#include "SEQ_sequencer.h"
+
/* Only for IMB_BlendMode */
#include "IMB_imbuf.h"
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 9d858da266d..2659cc13bcc 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -77,7 +77,8 @@
#include "BKE_modifier.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
-#include "BKE_sequencer.h"
+
+#include "SEQ_sequencer.h"
#include "NOD_socket.h"
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 835e2f92c7c..95cfeef4243 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -156,7 +156,6 @@
#include "BKE_pointcache.h"
#include "BKE_report.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BKE_shader_fx.h"
#include "BKE_subsurf.h"
#include "BKE_workspace.h"
@@ -168,6 +167,8 @@
#include "BLO_undofile.h"
#include "BLO_writefile.h"
+#include "SEQ_sequencer.h"
+
#include "readfile.h"
#include <errno.h>
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 7f9a745c1a4..a739e9cc46b 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -96,7 +96,6 @@
#include "BKE_pointcache.h"
#include "BKE_rigidbody.h"
#include "BKE_scene.h"
-#include "BKE_sequencer.h"
#include "BKE_shader_fx.h"
#include "BKE_simulation.h"
#include "BKE_sound.h"
@@ -110,6 +109,8 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
+#include "SEQ_sequencer.h"
+
#include "intern/builder/deg_builder.h"
#include "intern/depsgraph.h"
#include "intern/depsgraph_type.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index bac36885dfc..af281c3f0cf 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -89,7 +89,6 @@
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_rigidbody.h"
-#include "BKE_sequencer.h"
#include "BKE_shader_fx.h"
#include "BKE_shrinkwrap.h"
#include "BKE_sound.h"
@@ -99,6 +98,8 @@
#include "RNA_access.h"
#include "RNA_types.h"
+#include "SEQ_sequencer.h"
+
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 477dd316768..0a92cdb2e64 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -90,9 +90,10 @@
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_pointcache.h"
-#include "BKE_sequencer.h"
#include "BKE_sound.h"
+#include "SEQ_sequencer.h"
+
#include "intern/builder/deg_builder.h"
#include "intern/builder/deg_builder_nodes.h"
#include "intern/depsgraph.h"
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
index 4d79480a5ad..314254c0cf6 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.cc
@@ -28,9 +28,10 @@
#include "
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list