diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-06-02 22:52:36 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-06-02 22:52:36 +0300 |
commit | 5af72258161a6e903a5c526f2796db2a4e5bc483 (patch) | |
tree | cc4b043eccb7a11d19c8a52590c61dc8d147e56d | |
parent | 925df8ef26a353497c8088657a82b6b8545c67c1 (diff) |
Cleanup: Fix build warnings
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 | ||||
-rw-r--r-- | source/blender/sequencer/SEQ_time.h | 2 | ||||
-rw-r--r-- | source/blender/sequencer/intern/strip_time.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index d844b8c18c6..f22a515a8f2 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1601,7 +1601,7 @@ static int sequencer_add_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) /* Handle duplicated strips: set active, select, ensure unique name and duplicate animation * data. */ for (; seq; seq = seq->next) { - if (STREQ(active_seq != NULL && seq->name, active_seq->name)) { + if (active_seq != NULL && STREQ(seq->name, active_seq->name)) { SEQ_select_active_set(scene, seq); } seq->flag &= ~(SEQ_LEFTSEL + SEQ_RIGHTSEL + SEQ_LOCK); diff --git a/source/blender/sequencer/SEQ_time.h b/source/blender/sequencer/SEQ_time.h index 2a875370830..67d3a2e5960 100644 --- a/source/blender/sequencer/SEQ_time.h +++ b/source/blender/sequencer/SEQ_time.h @@ -45,7 +45,7 @@ int SEQ_time_find_next_prev_edit(struct Scene *scene, void SEQ_time_update_sequence(struct Scene *scene, struct Sequence *seq); void SEQ_time_update_sequence_bounds(struct Scene *scene, struct Sequence *seq); int SEQ_time_cmp_time_startdisp(const void *a, const void *b); -bool SEQ_time_strip_intersects_frame(struct Sequence *seq, const int timeline_frame); +bool SEQ_time_strip_intersects_frame(const struct Sequence *seq, const int timeline_frame); #ifdef __cplusplus } diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c index e64550f1428..b8b6f62c7aa 100644 --- a/source/blender/sequencer/intern/strip_time.c +++ b/source/blender/sequencer/intern/strip_time.c @@ -478,7 +478,7 @@ void seq_time_gap_info_get(const Scene *scene, * \param timeline_frame: absolute frame position * \return true if strip intersects with timeline frame. */ -bool SEQ_time_strip_intersects_frame(Sequence *seq, const int timeline_frame) +bool SEQ_time_strip_intersects_frame(const Sequence *seq, const int timeline_frame) { return (seq->startdisp <= timeline_frame) && (seq->enddisp > timeline_frame); } |