Commit: 88ada5e218835f060a23cbe0f1f2da7452e81b07
Author: Campbell Barton
Date: Wed Aug 26 09:59:15 2020 +1000
Branches: master
https://developer.blender.org/rB88ada5e218835f060a23cbe0f1f2da7452e81b07
Cleanup: add SEQ_ALL_BEGIN, SEQ_CURRENT_BEGIN to .clang-format
These were missed in 70500121b457d which caused reformatting.
===================================================================
M .clang-format
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenloader/intern/versioning_legacy.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_select.c
M source/blender/makesrna/intern/rna_color.c
===================================================================
diff --git a/.clang-format b/.clang-format
index 4db1b664fdb..8a992fea3a9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -253,8 +253,8 @@ ForEachMacros:
- RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
- SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
- SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
- - SEQP_BEGIN
- - SEQ_BEGIN
+ - SEQ_ALL_BEGIN
+ - SEQ_CURRENT_BEGIN
- SURFACE_QUAD_ITER_BEGIN
- foreach
- ED_screen_areas_iter
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index dc9e94e3c56..630c5f9fb1f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -507,8 +507,7 @@ void BKE_sequencer_editing_free(Scene *scene, const bool
do_id_user)
BKE_sequencer_prefetch_free(scene);
BKE_sequencer_cache_destruct(scene);
- SEQ_ALL_BEGIN(ed, seq)
- {
+ SEQ_ALL_BEGIN (ed, seq) {
/* handle cache freeing above */
BKE_sequence_free_ex(scene, seq, false, do_id_user, false);
}
@@ -6172,8 +6171,7 @@ void BKE_sequencer_check_uuids_unique_and_report(const
Scene *scene)
BLI_session_uuid_ghash_hash, BLI_session_uuid_ghash_compare, "sequencer
used uuids");
const Sequence *sequence;
- SEQ_ALL_BEGIN(scene->ed, sequence)
- {
+ SEQ_ALL_BEGIN (scene->ed, sequence) {
const SessionUUID *session_uuid = &sequence->runtime.session_uuid;
if (!BLI_session_uuid_is_generated(session_uuid)) {
printf("Sequence %s does not have UUID generated.\n", sequence->name);
diff --git a/source/blender/blenloader/intern/versioning_legacy.c
b/source/blender/blenloader/intern/versioning_legacy.c
index 6fcde80b655..58d57f12b8f 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -1251,8 +1251,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
while (sce) {
ed = sce->ed;
if (ed) {
- SEQ_ALL_BEGIN(sce->ed, seq)
- {
+ SEQ_ALL_BEGIN (sce->ed, seq) {
if (seq->type == SEQ_TYPE_IMAGE || seq->type == SEQ_TYPE_MOVIE) {
seq->alpha_mode = SEQ_ALPHA_STRAIGHT;
}
@@ -2443,8 +2442,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
Sequence *seq;
for (sce = bmain->scenes.first; sce; sce = sce->id.next) {
- SEQ_ALL_BEGIN(sce->ed, seq)
- {
+ SEQ_ALL_BEGIN (sce->ed, seq) {
if (seq->blend_mode == 0) {
seq->blend_opacity = 100.0f;
}
@@ -2597,8 +2595,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib,
Main *bmain)
while (sce) {
ed = sce->ed;
if (ed) {
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (seq->strip && seq->strip->proxy) {
seq->strip->proxy->quality = 90;
}
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c
b/source/blender/editors/space_sequencer/sequencer_edit.c
index 3802dee248a..f175c2a7419 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -217,8 +217,7 @@ 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 */
- SEQ_CURRENT_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;
@@ -484,8 +483,7 @@ void ED_sequencer_deselect_all(Scene *scene)
return;
}
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
seq->flag &= ~SEQ_ALLSEL;
}
SEQ_CURRENT_END;
@@ -1068,8 +1066,7 @@ static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene)
return;
}
- SEQ_CURRENT_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);
@@ -2298,16 +2295,14 @@ static int sequencer_split_exec(bContext *C, wmOperator
*op)
Sequence *seq;
if (ignore_selection) {
if (use_cursor_position) {
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (seq->enddisp == split_frame && seq->machine == split_channel) {
seq_selected = seq->flag & SEQ_ALLSEL;
}
}
SEQ_CURRENT_END;
if (!seq_selected) {
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (seq->startdisp == split_frame && seq->machine ==
split_channel) {
seq->flag &= ~SEQ_ALLSEL;
}
@@ -2318,8 +2313,7 @@ static int sequencer_split_exec(bContext *C, wmOperator
*op)
}
else {
if (split_side != SEQ_SIDE_BOTH) {
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (split_side == SEQ_SIDE_LEFT) {
if (seq->startdisp >= split_frame) {
seq->flag &= ~SEQ_ALLSEL;
@@ -2334,8 +2328,7 @@ static int sequencer_split_exec(bContext *C, wmOperator
*op)
SEQ_CURRENT_END;
}
}
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (seq->seq1 || seq->seq2 || seq->seq3) {
BKE_sequence_calc(scene, seq);
}
@@ -2552,8 +2545,7 @@ static int sequencer_delete_exec(bContext *C, wmOperator
*UNUSED(op))
BKE_sequencer_prefetch_stop(scene);
- SEQ_CURRENT_BEGIN(scene->ed, seq)
- {
+ SEQ_CURRENT_BEGIN (scene->ed, seq) {
if (seq->flag & SELECT) {
BKE_sequencer_flag_for_removal(scene, ed->seqbasep, seq);
}
@@ -3508,8 +3500,7 @@ 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");
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if ((seq->flag & SELECT)) {
ListBase queue = {NULL, NULL};
LinkData *link;
@@ -3577,8 +3568,7 @@ static int sequencer_enable_proxies_exec(bContext *C,
wmOperator *op)
turnon = false;
}
- SEQ_CURRENT_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);
@@ -4000,8 +3990,7 @@ static int sequencer_export_subtitles_exec(bContext *C,
wmOperator *op)
return OPERATOR_CANCELLED;
}
- SEQ_ALL_BEGIN(ed, seq)
- {
+ SEQ_ALL_BEGIN (ed, seq) {
if (seq->type == SEQ_TYPE_TEXT) {
BLI_addtail(&text_seq, MEM_dupallocN(seq));
}
diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c
b/source/blender/editors/space_sequencer/sequencer_modifier.c
index 4dfd0b5e66d..50f2a5084ef 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.c
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.c
@@ -232,8 +232,7 @@ static int strip_modifier_copy_exec(bContext *C, wmOperator
*op)
return OPERATOR_CANCELLED;
}
- SEQ_CURRENT_BEGIN(ed, seq_iter)
- {
+ SEQ_CURRENT_BEGIN (ed, seq_iter) {
if (seq_iter->flag & SELECT) {
if (seq_iter == seq) {
continue;
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c
b/source/blender/editors/space_sequencer/sequencer_select.c
index 66430d55ea4..955b4dba5e8 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -415,8 +415,7 @@ static int sequencer_select_exec(bContext *C, wmOperator
*op)
const float x = UI_view2d_region_to_view_x(v2d, mval[0]);
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (((x < CFRA) && (seq->enddisp <= CFRA)) || ((x >= CFRA) &&
(seq->startdisp >= CFRA))) {
/* Select left or right. */
seq->flag |= SELECT;
@@ -976,8 +975,7 @@ static int sequencer_select_side_of_frame_exec(bContext *C,
wmOperator *op)
ED_sequencer_deselect_all(scene);
}
const int cfra = CFRA;
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
bool test = false;
switch (side) {
case -1:
@@ -1284,8 +1282,7 @@ static bool select_grouped_type(Editing *ed, Sequence
*actseq, const int channel
Sequence *seq;
bool changed = false;
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (SEQ_CHANNEL_CHECK(seq, channel) && seq->type == actseq->type) {
seq->flag |= SELECT;
changed = true;
@@ -1302,8 +1299,7 @@ static bool select_grouped_type_basic(Editing *ed,
Sequence *actseq, const int c
bool changed = false;
const bool is_sound = SEQ_IS_SOUND(actseq);
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (SEQ_CHANNEL_CHECK(seq, channel) && (is_sound ? SEQ_IS_SOUND(seq) :
!SEQ_IS_SOUND(seq))) {
seq->flag |= SELECT;
changed = true;
@@ -1320,8 +1316,7 @@ static bool select_grouped_type_effect(Editing *ed,
Sequence *actseq, const int
bool changed = false;
const bool is_effect = SEQ_IS_EFFECT(actseq);
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (SEQ_CHANNEL_CHECK(seq, channel) &&
(is_effect ? SEQ_IS_EFFECT(seq) : !SEQ_IS_EFFECT(seq))) {
seq->flag |= SELECT;
@@ -1344,8 +1339,7 @@ static bool select_grouped_data(Editing *ed, Sequence
*actseq, const int channel
}
if (SEQ_HAS_PATH(actseq) && dir) {
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (SEQ_CHANNEL_CHECK(seq, channel) && SEQ_HAS_PATH(seq) && seq->strip &&
STREQ(seq->strip->dir, dir)) {
seq->flag |= SELECT;
@@ -1356,8 +1350,7 @@ static bool select_grouped_data(Editing *ed, Sequence
*actseq, const int channel
}
else if (actseq->type == SEQ_TYPE_SCENE) {
Scene *sce = actseq->scene;
- SEQ_CURRENT_BEGIN(ed, seq)
- {
+ SEQ_CURRENT_BEGIN (ed, seq) {
if (SEQ_CHANNEL_CHECK(seq, channel) && seq->type == SEQ_TYPE_SCENE &&
seq->scene == sce) {
seq->flag |= SELECT;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
