[Bf-blender-cvs] [6c177838f30] master: Cleanup: remove redundant alloc argument to SEQ_editing_get
Campbell Barton
noreply at git.blender.org
Thu Sep 2 03:47:20 CEST 2021
Commit: 6c177838f30a171c6b69b66d885cdefd01669a33
Author: Campbell Barton
Date: Thu Sep 2 11:29:32 2021 +1000
Branches: master
https://developer.blender.org/rB6c177838f30a171c6b69b66d885cdefd01669a33
Cleanup: remove redundant alloc argument to SEQ_editing_get
Callers that require lazy initialization can use SEQ_editing_ensure.
===================================================================
M source/blender/blenloader/intern/versioning_290.c
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/screen/screen_context.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
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_proxy.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/editors/transform/transform_snap_sequencer.c
M source/blender/editors/util/ed_util_imbuf.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/sequencer/SEQ_sequencer.h
M source/blender/sequencer/intern/prefetch.c
M source/blender/sequencer/intern/proxy_job.c
M source/blender/sequencer/intern/render.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/sequencer/intern/strip_edit.c
M source/blender/sequencer/intern/strip_relations.c
M source/blender/sequencer/intern/strip_select.c
M source/blender/sequencer/intern/strip_time.c
M source/blender/sequencer/intern/utils.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 7f7a2d97cbb..b217850e119 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -687,7 +687,7 @@ void do_versions_after_linking_290(Main *bmain, ReportList *UNUSED(reports))
if (!MAIN_VERSION_ATLEAST(bmain, 293, 16)) {
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
- seq_update_meta_disp_range(SEQ_editing_get(scene, false));
+ seq_update_meta_disp_range(SEQ_editing_get(scene));
}
/* Add a separate socket for Grid node X and Y size. */
@@ -1650,7 +1650,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed == NULL) {
continue;
}
diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c
index 2cc0f6ad288..916d4232f03 100644
--- a/source/blender/editors/animation/anim_deps.c
+++ b/source/blender/editors/animation/anim_deps.c
@@ -214,7 +214,7 @@ static void animchan_sync_fcurve_scene(bAnimListElem *ale)
}
/* Check if this strip is selected. */
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
Sequence *seq = SEQ_get_sequence_by_name(ed->seqbasep, seq_name, false);
MEM_freeN(seq_name);
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 2252fc4fcbc..7e3e3f363c2 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1103,7 +1103,7 @@ static bool skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_id
if (fcu->rna_path && (seq_name = BLI_str_quoted_substrN(fcu->rna_path, "sequences_all["))) {
/* Get strip name, and check if this strip is selected. */
Sequence *seq = NULL;
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed) {
seq = SEQ_get_sequence_by_name(ed->seqbasep, seq_name, false);
}
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c
index 6f3277397c5..450d7cd100e 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -105,7 +105,7 @@ static void seq_frame_snap_update_best(const int position,
static int seq_frame_apply_snap(bContext *C, Scene *scene, const int timeline_frame)
{
- ListBase *seqbase = SEQ_active_seqbase_get(SEQ_editing_get(scene, false));
+ ListBase *seqbase = SEQ_active_seqbase_get(SEQ_editing_get(scene));
SeqCollection *strips = SEQ_query_all_strips(seqbase);
int best_frame = 0;
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 13c338efdec..2ccefb993c7 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -623,7 +623,7 @@ static eContextResult screen_ctx_sequences(const bContext *C, bContextDataResult
{
wmWindow *win = CTX_wm_window(C);
Scene *scene = WM_window_get_active_scene(win);
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed) {
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
CTX_data_list_add(result, &scene->id, &RNA_Sequence, seq);
@@ -637,7 +637,7 @@ static eContextResult screen_ctx_selected_sequences(const bContext *C, bContextD
{
wmWindow *win = CTX_wm_window(C);
Scene *scene = WM_window_get_active_scene(win);
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed) {
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
if (seq->flag & SELECT) {
@@ -654,7 +654,7 @@ static eContextResult screen_ctx_selected_editable_sequences(const bContext *C,
{
wmWindow *win = CTX_wm_window(C);
Scene *scene = WM_window_get_active_scene(win);
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (ed) {
LISTBASE_FOREACH (Sequence *, seq, ed->seqbasep) {
if (seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) {
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 1feecc04ead..581892ebb3a 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -673,7 +673,7 @@ static void tree_element_sequence_activate(bContext *C,
const eOLSetState set)
{
Sequence *seq = (Sequence *)te->directdata;
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (BLI_findindex(ed->seqbasep, seq) != -1) {
if (set == OL_SETSEL_EXTEND) {
@@ -695,7 +695,7 @@ static void tree_element_sequence_activate(bContext *C,
static void tree_element_sequence_dup_activate(Scene *scene, TreeElement *UNUSED(te))
{
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
#if 0
select_single_seq(seq, 1);
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index d88ae82cc9a..7709c6bb053 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1286,7 +1286,7 @@ static void sequence_fn(int event, TreeElement *te, TreeStoreElem *UNUSED(tselem
{
Sequence *seq = (Sequence *)te->directdata;
Scene *scene = (Scene *)scene_ptr;
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (BLI_findindex(ed->seqbasep, seq) != -1) {
if (event == OL_DOP_SELECT) {
ED_sequencer_select_sequence_single(scene, seq, true);
diff --git a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
index 40f329d72c3..02af6a13cb3 100644
--- a/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
+++ b/source/blender/editors/space_outliner/tree/tree_display_sequencer.cc
@@ -43,7 +43,7 @@ ListBase TreeDisplaySequencer::buildTree(const TreeSourceData &source_data)
{
ListBase tree = {nullptr};
- Editing *ed = SEQ_editing_get(source_data.scene, false);
+ Editing *ed = SEQ_editing_get(source_data.scene);
if (ed == nullptr) {
return tree;
}
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 16b690dd6e4..081f0241e94 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -185,7 +185,7 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type)
Sequence *tgt = NULL;
Sequence *seq;
Scene *scene = CTX_data_scene(C);
- Editing *ed = SEQ_editing_get(scene, true);
+ Editing *ed = SEQ_editing_ensure(scene);
int timeline_frame = (int)CFRA;
int proximity = INT_MAX;
@@ -314,7 +314,7 @@ static void load_data_init_from_operator(SeqLoadData *load_data, bContext *C, wm
static void seq_load_apply_generic_options(bContext *C, wmOperator *op, Sequence *seq)
{
Scene *scene = CTX_data_scene(C);
- Editing *ed = SEQ_editing_get(scene, false);
+ Editing *ed = SEQ_editing_get(scene);
if (seq == NULL) {
return;
@@ -356,7 +356,7 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- const Editing *ed = SEQ_editing_get(scene, true);
+ const Editing *ed = SEQ_editing_ensure(scene);
Scene *sce_seq = BLI_findlink(&bmain->scenes, RNA_enum_get(op->ptr, "scene"));
if (sce_seq == NULL) {
@@ -384,7 +384,7 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op)
static void sequencer_disable_one_time_properties(bContext *C, wmOperator *op)
{
- Editing *ed = SEQ_editing_get(CTX_data_scene(C), false);
+ Editing *ed = SEQ_editing_get(CTX_data_scene(C));
/* Disable following properties if there are any existing strips, unless overridden by user. */
if (ed && ed->seqbasep && ed->seqbasep->first) {
if (RNA_struct_find_property(op->ptr, "use_framerate")) {
@@ -435,7 +435,7 @@ static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- const Editing *ed = SEQ_editing_get(scene, true);
+ const Editing *ed = SEQ_editing_ensure(scene);
MovieClip *clip = BLI_findlink(&bmain->movieclips, RNA_enum_get(op->ptr, "clip"));
if (clip == NULL) {
@@ -499,7 +499,7 @@ static int sequencer_add_mask_strip_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- const Editing *ed = SEQ_editing_get(scene, true);
+ const Editing *ed = SEQ_editing_ensure(scene);
Mask *mask = BLI_findlink(&bmain->masks, RNA_enum_get(op->ptr, "mask"));
if (mask == NULL) {
@@ -632,7 +632,7 @@ static void sequencer_add_movie_multiple_strips(bContext *C,
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- const Editing *ed = SEQ_editing_get(scene, true);
+ const Editing *ed = SEQ_editing_ensure(scene);
RNA_BEGIN (op->ptr, itemptr, "files") {
char dir_only[FILE_MAX];
@@ -668,7 +668,7 @@ static bool sequencer_add_movie_single_strip(bContext *C, wmOperator *op, SeqLoa
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- const Editing *ed = SEQ_editing_get(scene, true);
+ const Editing *ed = SEQ_editing_ensure(scene);
Sequence *seq_movie = NULL;
Sequence *seq_sound = NULL;
@@ -817,7 +817,7 @@ static void sequencer_add_sound_multiple_strips(bContext *C,
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- Editing *ed = SEQ_editing_get(scene, true);
+ Editing *ed = SEQ_editing_ensure(scene);
RNA_BEGIN (op->ptr, i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list