diff options
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 63 |
1 files changed, 37 insertions, 26 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 78ca2832c55..dcbac9bc817 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -216,7 +216,8 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports) file_list = BLI_gset_new(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, "file list"); bool selected = false; /* Check for no selected strips */ - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if (!ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META) || (seq->flag & SELECT) == 0) { continue; @@ -239,7 +240,7 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports) BKE_reportf(reports, RPT_WARNING, "Overwrite is not checked for %s, skipping", seq->name); } } - SEQ_END; + SEQ_CURRENT_END; if (!selected) { BKE_reportf(reports, RPT_WARNING, "Select movie or image strips"); @@ -482,10 +483,11 @@ void ED_sequencer_deselect_all(Scene *scene) return; } - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { seq->flag &= ~SEQ_ALLSEL; } - SEQ_END; + SEQ_CURRENT_END; } void recurs_sel_seq(Sequence *seqm) @@ -1030,7 +1032,7 @@ static void set_filter_seq(Scene *scene) return; } - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN (ed, seq) { if (seq->flag & SELECT) { if (seq->type == SEQ_TYPE_MOVIE) { seq->flag |= SEQ_FILTERY; @@ -1039,7 +1041,7 @@ static void set_filter_seq(Scene *scene) } } } - SEQ_END; + SEQ_CURRENT_END; } #endif @@ -1065,7 +1067,8 @@ static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene) return; } - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if (seq->flag & SELECT) { if (STREQLEN(seq->strip->dir, from, strlen(from))) { printf("found %s\n", seq->strip->dir); @@ -1080,7 +1083,7 @@ static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene) } } } - SEQ_END; + SEQ_CURRENT_END; } /** \} */ @@ -1308,7 +1311,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) } /* Test for effects and overlap. - * Don't use SEQP_BEGIN since that would be recursive. */ + * Don't use SEQ_CURRENT_BEGIN since that would be recursive. */ for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT && !(seq->depth == 0 && seq->flag & SEQ_LOCK)) { seq->flag &= ~SEQ_OVERLAP; @@ -2294,25 +2297,28 @@ static int sequencer_split_exec(bContext *C, wmOperator *op) Sequence *seq; if (ignore_selection) { if (use_cursor_position) { - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if (seq->enddisp == split_frame && seq->machine == split_channel) { seq_selected = seq->flag & SEQ_ALLSEL; } } - SEQ_END; + SEQ_CURRENT_END; if (!seq_selected) { - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if (seq->startdisp == split_frame && seq->machine == split_channel) { seq->flag &= ~SEQ_ALLSEL; } } - SEQ_END; + SEQ_CURRENT_END; } } } else { if (split_side != SEQ_SIDE_BOTH) { - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if (split_side == SEQ_SIDE_LEFT) { if (seq->startdisp >= split_frame) { seq->flag &= ~SEQ_ALLSEL; @@ -2324,15 +2330,16 @@ static int sequencer_split_exec(bContext *C, wmOperator *op) } } } - SEQ_END; + SEQ_CURRENT_END; } } - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if (seq->seq1 || seq->seq2 || seq->seq3) { BKE_sequence_calc(scene, seq); } } - SEQ_END; + SEQ_CURRENT_END; BKE_sequencer_sort(scene); } @@ -2521,12 +2528,13 @@ static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) BKE_sequencer_prefetch_stop(scene); - SEQP_BEGIN (scene->ed, seq) { + SEQ_CURRENT_BEGIN(scene->ed, seq) + { if (seq->flag & SELECT) { BKE_sequencer_flag_for_removal(scene, ed->seqbasep, seq); } } - SEQ_END; + SEQ_CURRENT_END; BKE_sequencer_remove_flagged_sequences(scene, ed->seqbasep); DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS); @@ -2952,7 +2960,7 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) recurs_del_seq_flag(scene, ed->seqbasep, SEQ_FLAG_DELETE, 0); /* Test for effects and overlap - * don't use SEQP_BEGIN since that would be recursive. */ + * don't use SEQ_CURRENT_BEGIN since that would be recursive. */ for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT) { seq->flag &= ~SEQ_OVERLAP; @@ -3476,7 +3484,8 @@ static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) file_list = BLI_gset_new(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, "file list"); - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if ((seq->flag & SELECT)) { ListBase queue = {NULL, NULL}; LinkData *link; @@ -3493,7 +3502,7 @@ static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); } } - SEQ_END; + SEQ_CURRENT_END; BLI_gset_free(file_list, MEM_freeN); @@ -3544,7 +3553,8 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) turnon = false; } - SEQP_BEGIN (ed, seq) { + SEQ_CURRENT_BEGIN(ed, seq) + { if ((seq->flag & SELECT)) { if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META)) { BKE_sequencer_proxy_set(seq, turnon); @@ -3589,7 +3599,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) } } } - SEQ_END; + SEQ_CURRENT_END; WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -3966,12 +3976,13 @@ static int sequencer_export_subtitles_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - SEQ_BEGIN (ed, seq) { + SEQ_ALL_BEGIN(ed, seq) + { if (seq->type == SEQ_TYPE_TEXT) { BLI_addtail(&text_seq, MEM_dupallocN(seq)); } } - SEQ_END; + SEQ_ALL_END; if (BLI_listbase_is_empty(&text_seq)) { BKE_report(op->reports, RPT_ERROR, "No subtitles (text strips) to export"); |