Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2020-12-19 08:44:57 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-12-19 09:25:01 +0300
commita5a302bd18061e833c4d629fffd06f57e7447d39 (patch)
tree7fd13444a1093f1f85fb26c9ff49598489c827e6 /source/blender/blenkernel
parent046ca0749a9389ec52da90b29c8b2032f3225c51 (diff)
Cleanup: Split SEQ_sequencer.h file
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/bpath.c2
-rw-r--r--source/blender/blenkernel/intern/image.c2
-rw-r--r--source/blender/blenkernel/intern/ipo.c2
-rw-r--r--source/blender/blenkernel/intern/scene.c8
-rw-r--r--source/blender/blenkernel/intern/sound.c1
5 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index f624d0ae057..762ced7dc5f 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -78,7 +78,7 @@
#include "CLG_log.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#ifndef _MSC_VER
# include "BLI_strict_flags.h"
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 090ab571542..ab57d14d2cf 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -93,7 +93,7 @@
#include "RE_pipeline.h"
-#include "SEQ_sequencer.h" /* seq_foreground_frame_get() */
+#include "SEQ_utils.h" /* SEQ_get_topmost_sequence() */
#include "GPU_texture.h"
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 0e611b21304..1ab6e61e20e 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -74,7 +74,7 @@
#include "MEM_guardedalloc.h"
-#include "SEQ_sequencer.h"
+#include "SEQ_iterator.h"
#include "BLO_read_write.h"
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 7acd54b6af1..c099fdb0e19 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -109,7 +109,13 @@
#include "RE_engine.h"
+#include "SEQ_edit.h"
+#include "SEQ_iterator.h"
+#include "SEQ_modifier.h"
+#include "SEQ_proxy.h"
+#include "SEQ_relations.h"
#include "SEQ_sequencer.h"
+#include "SEQ_sound.h"
#include "BLO_read_write.h"
@@ -3733,6 +3739,6 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene)
}
}
SEQ_ALL_END;
- SEQ_sound_update_muting(scene->ed);
+ SEQ_edit_update_muting(scene->ed);
SEQ_sound_update_bounds_all(scene);
}
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index d167fc4e51f..78729fb9261 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -68,6 +68,7 @@
#include "BLO_read_write.h"
#include "SEQ_sequencer.h"
+#include "SEQ_sound.h"
static void sound_free_audio(bSound *sound);