diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
commit | 2bc791437e3b8e42c1369daf15c72934474b1e73 (patch) | |
tree | f2202c3753c8288bea47d3c0edd10bcf01cdf339 /source/blender/editors/space_sequencer/sequencer_edit.c | |
parent | c3764fe1e80670cd578df7bbc5c37c267e81013a (diff) |
Cleanup: use 'r_' prefix for output arguments
Also pass some args as 'const'.
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 3f36c844f30..71e63547eae 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -551,15 +551,15 @@ bool ED_space_sequencer_check_show_strip(SpaceSeq *sseq) int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, - Sequence **selseq1, - Sequence **selseq2, - Sequence **selseq3, - const char **error_str) + Sequence **r_selseq1, + Sequence **r_selseq2, + Sequence **r_selseq3, + const char **r_error_str) { Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq1 = NULL, *seq2 = NULL, *seq3 = NULL, *seq; - *error_str = NULL; + *r_error_str = NULL; if (!activeseq) { seq2 = BKE_sequencer_active_get(scene); @@ -568,7 +568,7 @@ int seq_effect_find_selected(Scene *scene, for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT) { if (seq->type == SEQ_TYPE_SOUND_RAM && BKE_sequence_effect_get_num_inputs(type) != 0) { - *error_str = N_("Cannot apply effects to audio sequence strips"); + *r_error_str = N_("Cannot apply effects to audio sequence strips"); return 0; } if ((seq != activeseq) && (seq != seq2)) { @@ -582,7 +582,7 @@ int seq_effect_find_selected(Scene *scene, seq3 = seq; } else { - *error_str = N_("Cannot apply effect to more than 3 sequence strips"); + *r_error_str = N_("Cannot apply effect to more than 3 sequence strips"); return 0; } } @@ -599,11 +599,11 @@ int seq_effect_find_selected(Scene *scene, switch (BKE_sequence_effect_get_num_inputs(type)) { case 0: - *selseq1 = *selseq2 = *selseq3 = NULL; + *r_selseq1 = *r_selseq2 = *r_selseq3 = NULL; return 1; /* success */ case 1: if (seq2 == NULL) { - *error_str = N_("At least one selected sequence strip is needed"); + *r_error_str = N_("At least one selected sequence strip is needed"); return 0; } if (seq1 == NULL) { @@ -615,7 +615,7 @@ int seq_effect_find_selected(Scene *scene, ATTR_FALLTHROUGH; case 2: if (seq1 == NULL || seq2 == NULL) { - *error_str = N_("2 selected sequence strips are needed"); + *r_error_str = N_("2 selected sequence strips are needed"); return 0; } if (seq3 == NULL) { @@ -625,13 +625,13 @@ int seq_effect_find_selected(Scene *scene, } if (seq1 == NULL && seq2 == NULL && seq3 == NULL) { - *error_str = N_("TODO: in what cases does this happen?"); + *r_error_str = N_("TODO: in what cases does this happen?"); return 0; } - *selseq1 = seq1; - *selseq2 = seq2; - *selseq3 = seq3; + *r_selseq1 = seq1; + *r_selseq2 = seq2; + *r_selseq3 = seq3; return 1; } |