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:
authorCampbell Barton <ideasman42@gmail.com>2021-09-02 04:29:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-09-02 04:29:32 +0300
commit6c177838f30a171c6b69b66d885cdefd01669a33 (patch)
tree3c68d788c2c6470d5af60196cfadb11212a81e73 /source/blender/sequencer
parentbaee000001f6a840f7aa15ad3834afc6639ef0f2 (diff)
Cleanup: remove redundant alloc argument to SEQ_editing_get
Callers that require lazy initialization can use SEQ_editing_ensure.
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r--source/blender/sequencer/SEQ_sequencer.h2
-rw-r--r--source/blender/sequencer/intern/prefetch.c2
-rw-r--r--source/blender/sequencer/intern/proxy_job.c2
-rw-r--r--source/blender/sequencer/intern/render.c2
-rw-r--r--source/blender/sequencer/intern/sequencer.c5
-rw-r--r--source/blender/sequencer/intern/strip_edit.c2
-rw-r--r--source/blender/sequencer/intern/strip_relations.c8
-rw-r--r--source/blender/sequencer/intern/strip_select.c6
-rw-r--r--source/blender/sequencer/intern/strip_time.c4
-rw-r--r--source/blender/sequencer/intern/utils.c2
10 files changed, 16 insertions, 19 deletions
diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h
index 15fe0be3571..d7800d208a4 100644
--- a/source/blender/sequencer/SEQ_sequencer.h
+++ b/source/blender/sequencer/SEQ_sequencer.h
@@ -65,7 +65,7 @@ short SEQ_tool_settings_snap_mode_get(struct Scene *scene);
int SEQ_tool_settings_snap_distance_get(struct Scene *scene);
eSeqOverlapMode SEQ_tool_settings_overlap_mode_get(struct Scene *scene);
struct SequencerToolSettings *SEQ_tool_settings_copy(struct SequencerToolSettings *tool_settings);
-struct Editing *SEQ_editing_get(struct Scene *scene, bool alloc);
+struct Editing *SEQ_editing_get(const struct Scene *scene);
struct Editing *SEQ_editing_ensure(struct Scene *scene);
void SEQ_editing_free(struct Scene *scene, const bool do_id_user);
struct ListBase *SEQ_active_seqbase_get(const struct Editing *ed);
diff --git a/source/blender/sequencer/intern/prefetch.c b/source/blender/sequencer/intern/prefetch.c
index dd2d828415c..3e0b4738db1 100644
--- a/source/blender/sequencer/intern/prefetch.c
+++ b/source/blender/sequencer/intern/prefetch.c
@@ -491,7 +491,7 @@ static void *seq_prefetch_frames(void *job)
*/
pfjob->scene_eval->ed->prefetch_job = pfjob;
- ListBase *seqbase = SEQ_active_seqbase_get(SEQ_editing_get(pfjob->scene, false));
+ ListBase *seqbase = SEQ_active_seqbase_get(SEQ_editing_get(pfjob->scene));
if (seq_prefetch_must_skip_frame(pfjob, seqbase)) {
pfjob->num_frames_prefetched++;
continue;
diff --git a/source/blender/sequencer/intern/proxy_job.c b/source/blender/sequencer/intern/proxy_job.c
index aea66da4cc4..afdac04d998 100644
--- a/source/blender/sequencer/intern/proxy_job.c
+++ b/source/blender/sequencer/intern/proxy_job.c
@@ -79,7 +79,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog
static void proxy_endjob(void *pjv)
{
ProxyJob *pj = pjv;
- Editing *ed = SEQ_editing_get(pj->scene, false);
+ Editing *ed = SEQ_editing_get(pj->scene);
LinkData *link;
for (link = pj->queue.first; link; link = link->next) {
diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c
index 0c07a25e2e2..6c4502a3608 100644
--- a/source/blender/sequencer/intern/render.c
+++ b/source/blender/sequencer/intern/render.c
@@ -1921,7 +1921,7 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context,
ImBuf *SEQ_render_give_ibuf(const SeqRenderData *context, float timeline_frame, int chanshown)
{
Scene *scene = context->scene;
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
ListBase *seqbasep;
if (ed == NULL) {
diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c
index a62b76cd832..bf5942090c9 100644
--- a/source/blender/sequencer/intern/sequencer.c
+++ b/source/blender/sequencer/intern/sequencer.c
@@ -240,11 +240,8 @@ void seq_free_sequence_recurse(Scene *scene,
seq_sequence_free_ex(scene, seq, false, do_id_user, do_clean_animdata);
}
-Editing *SEQ_editing_get(Scene *scene, bool alloc)
+Editing *SEQ_editing_get(const Scene *scene)
{
- if (alloc) {
- SEQ_editing_ensure(scene);
- }
return scene->ed;
}
diff --git a/source/blender/sequencer/intern/strip_edit.c b/source/blender/sequencer/intern/strip_edit.c
index 820a73cb8d7..cfac243e68f 100644
--- a/source/blender/sequencer/intern/strip_edit.c
+++ b/source/blender/sequencer/intern/strip_edit.c
@@ -227,7 +227,7 @@ bool SEQ_edit_move_strip_to_meta(Scene *scene,
const char **error_str)
{
/* Find the appropriate seqbase */
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
ListBase *seqbase = SEQ_get_seqbase_by_seq(&ed->seqbase, src_seq);
if (dst_seqm->type != SEQ_TYPE_META) {
diff --git a/source/blender/sequencer/intern/strip_relations.c b/source/blender/sequencer/intern/strip_relations.c
index b840b19f244..46fdd2c3d14 100644
--- a/source/blender/sequencer/intern/strip_relations.c
+++ b/source/blender/sequencer/intern/strip_relations.c
@@ -134,7 +134,7 @@ static bool seq_relations_find_and_invalidate_metas(Scene *scene,
ListBase *seqbase;
if (meta_seq == NULL) {
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
seqbase = &ed->seqbase;
}
else {
@@ -342,7 +342,7 @@ void SEQ_relations_update_changed_seq_and_deps(Scene *scene,
int len_change,
int ibuf_change)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
Sequence *seq;
if (ed == NULL) {
@@ -370,7 +370,7 @@ static void sequencer_all_free_anim_ibufs(ListBase *seqbase, int timeline_frame)
/* Unused */
void SEQ_relations_free_all_anim_ibufs(Scene *scene, int timeline_frame)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed == NULL) {
return;
}
@@ -401,7 +401,7 @@ static Sequence *sequencer_check_scene_recursion(Scene *scene, ListBase *seqbase
bool SEQ_relations_check_scene_recursion(Scene *scene, ReportList *reports)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed == NULL) {
return false;
}
diff --git a/source/blender/sequencer/intern/strip_select.c b/source/blender/sequencer/intern/strip_select.c
index 7cdd756e2d9..8927e092864 100644
--- a/source/blender/sequencer/intern/strip_select.c
+++ b/source/blender/sequencer/intern/strip_select.c
@@ -34,7 +34,7 @@
Sequence *SEQ_select_active_get(Scene *scene)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed == NULL) {
return NULL;
@@ -45,7 +45,7 @@ Sequence *SEQ_select_active_get(Scene *scene)
void SEQ_select_active_set(Scene *scene, Sequence *seq)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed == NULL) {
return;
@@ -56,7 +56,7 @@ void SEQ_select_active_set(Scene *scene, Sequence *seq)
int SEQ_select_active_get_pair(Scene *scene, Sequence **r_seq_act, Sequence **r_seq_other)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
*r_seq_act = SEQ_select_active_get(scene);
diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c
index b73ac631693..fd6c0805c23 100644
--- a/source/blender/sequencer/intern/strip_time.c
+++ b/source/blender/sequencer/intern/strip_time.c
@@ -249,7 +249,7 @@ void SEQ_time_update_sequence(Scene *scene, Sequence *seq)
seq_time_update_meta_strip(scene, seq);
}
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
MetaStack *ms = SEQ_meta_stack_active_get(ed);
if (ms != NULL) {
SEQ_time_update_meta_strip_range(scene, ms->parseq);
@@ -266,7 +266,7 @@ int SEQ_time_find_next_prev_edit(Scene *scene,
const bool do_center,
const bool do_unselected)
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
Sequence *seq;
int dist, best_dist, best_frame = timeline_frame;
diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c
index e4eecaf552c..1d3e7e4a223 100644
--- a/source/blender/sequencer/intern/utils.c
+++ b/source/blender/sequencer/intern/utils.c
@@ -257,7 +257,7 @@ ListBase *SEQ_get_seqbase_from_sequence(Sequence *seq, int *r_offset)
}
case SEQ_TYPE_SCENE: {
if (seq->flag & SEQ_SCENE_STRIPS && seq->scene) {
- Editing *ed = SEQ_editing_get(seq->scene, false);
+ Editing *ed = SEQ_editing_get(seq->scene);
if (ed) {
seqbase = &ed->seqbase;
*r_offset = seq->scene->r.sfra;