archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Editors/Space/sequencer, Clang-Tidy else-after-return fixes

Browse Source 
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/editors/space_sequencer` module.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2020-07-03 17:20:58 +02:00
parent a201020cd3
commit 35ce16939c
5 changed files with 39 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@@ -1898,19 +1898,19 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *region)
if ((seq->flag & SELECT) != sel) {
continue;
}
else if (seq == last_seq && (last_seq->flag & SELECT)) {
if (seq == last_seq && (last_seq->flag & SELECT)) {
continue;
}
else if (min_ii(seq->startdisp, seq->start) > v2d->cur.xmax) {
if (min_ii(seq->startdisp, seq->start) > v2d->cur.xmax) {
continue;
}
else if (max_ii(seq->enddisp, seq->start + seq->len) < v2d->cur.xmin) {
if (max_ii(seq->enddisp, seq->start + seq->len) < v2d->cur.xmin) {
continue;
}
else if (seq->machine + 1.0f < v2d->cur.ymin) {
if (seq->machine + 1.0f < v2d->cur.ymin) {
continue;
}
else if (seq->machine > v2d->cur.ymax) {
if (seq->machine > v2d->cur.ymax) {
continue;
}

65
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@@ -227,7 +227,7 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports)
BKE_reportf(reports, RPT_WARNING, "Proxy is not enabled for %s, skipping", seq->name);
continue;
}
else if (seq->strip->proxy->build_size_flags == 0) {
if (seq->strip->proxy->build_size_flags == 0) {
BKE_reportf(reports, RPT_WARNING, "Resolution is not selected for %s, skipping", seq->name);
continue;
}
@@ -392,7 +392,7 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i
best_seq = seq;
break;
}
else if (dist < best_dist) {
if (dist < best_dist) {
best_dist = dist;
best_seq = seq;
}
@@ -475,16 +475,16 @@ static bool seq_is_predecessor(Sequence *pred, Sequence *seq)
if (pred == seq) {
return 0;
}
else if (seq_is_parent(pred, seq)) {
if (seq_is_parent(pred, seq)) {
return 1;
}
else if (pred->seq1 && seq_is_predecessor(pred->seq1, seq)) {
if (pred->seq1 && seq_is_predecessor(pred->seq1, seq)) {
return 1;
}
else if (pred->seq2 && seq_is_predecessor(pred->seq2, seq)) {
if (pred->seq2 && seq_is_predecessor(pred->seq2, seq)) {
return 1;
}
else if (pred->seq3 && seq_is_predecessor(pred->seq3, seq)) {
if (pred->seq3 && seq_is_predecessor(pred->seq3, seq)) {
return 1;
}
@@ -700,10 +700,10 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq)
if (!seq) {
return NULL;
}
else if (!(seq->type & SEQ_TYPE_EFFECT)) {
if (!(seq->type & SEQ_TYPE_EFFECT)) {
return ((seq->flag & SELECT) ? NULL : seq);
}
else if (!(seq->flag & SELECT)) {
if (!(seq->flag & SELECT)) {
/* Try to find replacement for effect inputs. */
seq1 = del_seq_find_replace_recurs(scene, seq->seq1);
seq2 = del_seq_find_replace_recurs(scene, seq->seq2);
@@ -734,13 +734,9 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq)
if ((seq3 = del_seq_find_replace_recurs(scene, seq->seq3))) {
return seq3;
}
else {
return NULL;
}
}
else {
return seq;
return NULL;
}
return seq;
}
static void del_seq_clear_modifiers_recurs(Scene *scene, Sequence *deleting_sequence)
@@ -1744,9 +1740,7 @@ static int sequencer_slip_exec(bContext *C, wmOperator *op)
DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
return OPERATOR_FINISHED;
}
else {
return OPERATOR_CANCELLED;
}
return OPERATOR_CANCELLED;
}
static void sequencer_slip_update_header(Scene *scene, ScrArea *area, SlipData *data, int offset)
@@ -2433,10 +2427,9 @@ static int sequencer_split_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
return OPERATOR_FINISHED;
}
else {
/* Passthrough to selection if used as tool. */
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
/* Passthrough to selection if used as tool. */
return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
static int sequencer_split_invoke(bContext *C, wmOperator *op, const wmEvent *event)
@@ -3030,18 +3023,16 @@ static int seq_depends_on_meta(Sequence *seq, Sequence *seqm)
if (seq == seqm) {
return 1;
}
else if (seq->seq1 && seq_depends_on_meta(seq->seq1, seqm)) {
if (seq->seq1 && seq_depends_on_meta(seq->seq1, seqm)) {
return 1;
}
else if (seq->seq2 && seq_depends_on_meta(seq->seq2, seqm)) {
if (seq->seq2 && seq_depends_on_meta(seq->seq2, seqm)) {
return 1;
}
else if (seq->seq3 && seq_depends_on_meta(seq->seq3, seqm)) {
if (seq->seq3 && seq_depends_on_meta(seq->seq3, seqm)) {
return 1;
}
else {
return 0;
}
return 0;
}
static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
@@ -3772,9 +3763,8 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_ERROR, "One of the effect inputs is unset, cannot swap");
return OPERATOR_CANCELLED;
}
else {
SWAP(Sequence *, *seq_1, *seq_2);
}
SWAP(Sequence *, *seq_1, *seq_2);
BKE_sequencer_update_changed_seq_and_deps(scene, seq, 0, 1);
@@ -3829,15 +3819,14 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_ERROR, "New effect needs more input strips");
return OPERATOR_CANCELLED;
}
else {
sh = BKE_sequence_get_effect(seq);
sh.free(seq, true);
seq->type = new_type;
sh = BKE_sequence_get_effect(seq);
sh.free(seq, true);
sh = BKE_sequence_get_effect(seq);
sh.init(seq);
}
seq->type = new_type;
sh = BKE_sequence_get_effect(seq);
sh.init(seq);
BKE_sequencer_update_changed_seq_and_deps(scene, seq, 0, 1);
/* Invalidate cache. */
@@ -4191,7 +4180,7 @@ static int sequencer_set_range_to_strips_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_WARNING, "Select one or more strips");
return OPERATOR_CANCELLED;
}
else if (efra < 0) {
if (efra < 0) {
BKE_report(op->reports, RPT_ERROR, "Can't set a negative range");
return OPERATOR_CANCELLED;
}

18
source/blender/editors/space_sequencer/sequencer_scopes.c
View File

@@ -232,9 +232,7 @@ ImBuf *make_waveform_view_from_ibuf(ImBuf *ibuf)
if (ibuf->rect_float) {
return make_waveform_view_from_ibuf_float(ibuf);
}
else {
return make_waveform_view_from_ibuf_byte(ibuf);
}
return make_waveform_view_from_ibuf_byte(ibuf);
}
static ImBuf *make_sep_waveform_view_from_ibuf_byte(ImBuf *ibuf)
@@ -336,9 +334,7 @@ ImBuf *make_sep_waveform_view_from_ibuf(ImBuf *ibuf)
if (ibuf->rect_float) {
return make_sep_waveform_view_from_ibuf_float(ibuf);
}
else {
return make_sep_waveform_view_from_ibuf_byte(ibuf);
}
return make_sep_waveform_view_from_ibuf_byte(ibuf);
}
static void draw_zebra_byte(ImBuf *src, ImBuf *ibuf, float perc)
@@ -541,7 +537,7 @@ BLI_INLINE int get_bin_float(float f)
if (f < -0.25f) {
return 0;
}
else if (f >= 1.25f) {
if (f >= 1.25f) {
return 511;
}
@@ -627,9 +623,7 @@ ImBuf *make_histogram_view_from_ibuf(ImBuf *ibuf)
if (ibuf->rect_float) {
return make_histogram_view_from_ibuf_float(ibuf);
}
else {
return make_histogram_view_from_ibuf_byte(ibuf);
}
return make_histogram_view_from_ibuf_byte(ibuf);
}
static void vectorscope_put_cross(uchar r, uchar g, uchar b, char *tgt, int w, int h, int size)
@@ -757,7 +751,5 @@ ImBuf *make_vectorscope_view_from_ibuf(ImBuf *ibuf)
if (ibuf->rect_float) {
return make_vectorscope_view_from_ibuf_float(ibuf);
}
else {
return make_vectorscope_view_from_ibuf_byte(ibuf);
}
return make_vectorscope_view_from_ibuf_byte(ibuf);
}

4
source/blender/editors/space_sequencer/sequencer_view.c
View File

@@ -321,9 +321,7 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
else {
return OPERATOR_CANCELLED;
}
return OPERATOR_CANCELLED;
}
void SEQUENCER_OT_view_selected(wmOperatorType *ot)

2
source/blender/editors/space_sequencer/space_sequencer.c
View File

@@ -464,7 +464,7 @@ static int sequencer_context(const bContext *C, const char *member, bContextData
return true;
}
else if (CTX_data_equals(member, "edit_mask")) {
if (CTX_data_equals(member, "edit_mask")) {
Mask *mask = BKE_sequencer_mask_get(scene);
if (mask) {
CTX_data_id_pointer_set(result, &mask->id);