From 9767ff891607fed7b6b5c2f1a99a122f220ec5dc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 20 Mar 2014 15:45:20 +0600 Subject: Code cleanup: use true/false in sequencer functions --- source/blender/editors/animation/anim_deps.c | 2 +- source/blender/editors/animation/anim_filter.c | 2 +- source/blender/editors/screen/screen_context.c | 6 +- .../editors/space_outliner/outliner_select.c | 4 +- .../blender/editors/space_outliner/outliner_tree.c | 2 +- .../editors/space_sequencer/sequencer_add.c | 14 +-- .../editors/space_sequencer/sequencer_draw.c | 14 +-- .../editors/space_sequencer/sequencer_edit.c | 138 ++++++++++----------- .../editors/space_sequencer/sequencer_intern.h | 2 +- .../editors/space_sequencer/sequencer_modifier.c | 2 +- .../editors/space_sequencer/sequencer_select.c | 30 ++--- .../editors/space_sequencer/sequencer_view.c | 2 +- .../editors/space_sequencer/space_sequencer.c | 4 +- .../editors/transform/transform_conversions.c | 16 +-- 14 files changed, 119 insertions(+), 119 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_deps.c b/source/blender/editors/animation/anim_deps.c index 618c1b04a71..71e405a2209 100644 --- a/source/blender/editors/animation/anim_deps.c +++ b/source/blender/editors/animation/anim_deps.c @@ -243,7 +243,7 @@ static void animchan_sync_fcurve(bAnimContext *ac, bAnimListElem *ale, FCurve ** /* only affect if F-Curve involves sequence_editor.sequences */ if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; char *seq_name; diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index c1820ff1b3a..9ec8b678f0b 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -914,7 +914,7 @@ static bool skip_fcurve_selected_data(bDopeSheet *ads, FCurve *fcu, ID *owner_id /* only consider if F-Curve involves sequence_editor.sequences */ if ((fcu->rna_path) && strstr(fcu->rna_path, "sequences_all")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = NULL; char *seq_name; diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index a516603cfd4..b1c57030130 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -357,7 +357,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult return 1; } else if (CTX_data_equals(member, "sequences")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -368,7 +368,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "selected_sequences")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -381,7 +381,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "selected_editable_sequences")) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 688695e3ded..89f17bc611b 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -724,7 +724,7 @@ static eOLDrawState tree_element_active_sequence( bContext *C, Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) { Sequence *seq = (Sequence *) te->directdata; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (set != OL_SETSEL_NONE) { /* only check on setting */ @@ -757,7 +757,7 @@ static eOLDrawState tree_element_active_sequence_dup( Scene *scene, TreeElement *te, TreeStoreElem *UNUSED(tselem), const eOLSetState set) { Sequence *seq, *p; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); seq = (Sequence *)te->directdata; if (set == OL_SETSEL_NONE) { diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 4231dc6f9f8..0c8c7a2e12f 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1630,7 +1630,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops) } else if (soops->outlinevis == SO_SEQUENCE) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); int op; if (ed == NULL) diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index e816494faaf..d6b5bb3e534 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -130,7 +130,7 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type) Sequence *tgt = NULL; Sequence *seq; Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); int cfra = (int) CFRA; int proximity = INT_MAX; @@ -240,7 +240,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); Scene *sce_seq; @@ -334,7 +334,7 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) static int sequencer_add_movieclip_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); MovieClip *clip; @@ -426,7 +426,7 @@ void SEQUENCER_OT_movieclip_strip_add(struct wmOperatorType *ot) static int sequencer_add_mask_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); Mask *mask; @@ -519,7 +519,7 @@ void SEQUENCER_OT_mask_strip_add(struct wmOperatorType *ot) static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoadFunc seq_load_func) { Scene *scene = CTX_data_scene(C); /* only for sound */ - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); SeqLoadInfo seq_load; Sequence *seq; int tot_files; @@ -688,7 +688,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) /* cant use the generic function for this */ Scene *scene = CTX_data_scene(C); /* only for sound */ - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); SeqLoadInfo seq_load; Sequence *seq; @@ -788,7 +788,7 @@ void SEQUENCER_OT_image_strip_add(struct wmOperatorType *ot) static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); + Editing *ed = BKE_sequencer_editing_get(scene, true); Sequence *seq; /* generic strip vars */ Strip *strip; diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index caade2dc59f..9f7f40899b2 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -702,8 +702,8 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline /* draw the main strip body */ if (is_single_image) { /* single image */ draw_shadedstrip(seq, background_col, - BKE_sequence_tx_get_final_left(seq, 0), y1, - BKE_sequence_tx_get_final_right(seq, 0), y2); + BKE_sequence_tx_get_final_left(seq, false), y1, + BKE_sequence_tx_get_final_right(seq, false), y2); } else { /* normal operation */ draw_shadedstrip(seq, background_col, x1, y1, x2, y2); @@ -843,7 +843,7 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, Scene *scene, SpaceSeq *sseq, int /* sequencer could start rendering, in this case we need to be sure it wouldn't be canceled * by Esc pressed somewhere in the past */ - G.is_break = FALSE; + G.is_break = false; if (special_seq_update) ibuf = BKE_sequencer_give_ibuf_direct(&context, cfra + frame_ofs, special_seq_update); @@ -903,7 +903,7 @@ static ImBuf *sequencer_make_scope(Scene *scene, ImBuf *ibuf, ImBuf *(*make_scop return scope; } -void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs, int draw_overlay) +void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs, bool draw_overlay) { struct Main *bmain = CTX_data_main(C); struct ImBuf *ibuf = NULL; @@ -922,7 +922,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq int format, type; bool glsl_used = false; - if (G.is_rendering == FALSE && (scene->r.seq_flag & R_SEQ_GL_PREV) == 0) { + if (G.is_rendering == false && (scene->r.seq_flag & R_SEQ_GL_PREV) == 0) { /* stop all running jobs, except screen one. currently previews frustrate Render * needed to make so sequencer's rendering doesn't conflict with compositor */ @@ -1262,7 +1262,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq 0, 0, 0, /* TODO */ width, height, aspx, aspy, - FALSE, TRUE, + false, true, NULL, C); } } @@ -1405,7 +1405,7 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d) void draw_timeline_seq(const bContext *C, ARegion *ar) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); SpaceSeq *sseq = CTX_wm_space_seq(C); View2D *v2d = &ar->v2d; View2DScrollers *scrollers; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 1464d39ff23..ddade51e5ad 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -165,14 +165,14 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog static void proxy_endjob(void *pjv) { ProxyJob *pj = pjv; - Editing *ed = BKE_sequencer_editing_get(pj->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(pj->scene, false); LinkData *link; for (link = pj->queue.first; link; link = link->next) { BKE_sequencer_proxy_rebuild_finish(link->data, pj->stop); } - BKE_sequencer_free_imbuf(pj->scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(pj->scene, &ed->seqbase, false); WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, pj->scene); } @@ -182,7 +182,7 @@ static void seq_proxy_build_job(const bContext *C) wmJob *wm_job; ProxyJob *pj; Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ScrArea *sa = CTX_wm_area(C); struct SeqIndexBuildContext *context; LinkData *link; @@ -215,7 +215,7 @@ static void seq_proxy_build_job(const bContext *C) SEQ_END if (!WM_jobs_is_running(wm_job)) { - G.is_break = FALSE; + G.is_break = false; WM_jobs_start(CTX_wm_manager(C), wm_job); } @@ -237,7 +237,7 @@ void seq_rectf(Sequence *seq, rctf *rectf) void boundbox_seq(Scene *scene, rctf *rect) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); float min[2], max[2]; @@ -284,7 +284,7 @@ Sequence *find_neighboring_sequence(Scene *scene, Sequence *test, int lr, int se { /* sel - 0==unselected, 1==selected, -1==done care*/ Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return NULL; @@ -316,7 +316,7 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i { /* sel - 0==unselected, 1==selected, -1==done care*/ Sequence *seq, *best_seq = NULL; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); int dist, best_dist; best_dist = MAXFRAME * 2; @@ -364,7 +364,7 @@ static Sequence *find_next_prev_sequence(Scene *scene, Sequence *test, int lr, i Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[2]) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); float x, y; float pixelx; float handsize; @@ -439,7 +439,7 @@ static bool seq_is_predecessor(Sequence *pred, Sequence *seq) void ED_sequencer_deselect_all(Scene *scene) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -481,7 +481,7 @@ bool ED_space_sequencer_check_show_maskedit(SpaceSeq *sseq, Scene *scene) return (BKE_sequencer_mask_get(scene) != NULL); } - return FALSE; + return false; } int ED_space_sequencer_maskedit_poll(bContext *C) @@ -505,7 +505,7 @@ bool ED_space_sequencer_check_show_imbuf(SpaceSeq *sseq) int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, const char **error_str) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq1 = NULL, *seq2 = NULL, *seq3 = NULL, *seq; *error_str = NULL; @@ -616,7 +616,7 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq) static void del_seq_clear_modifiers_recurs(Scene *scene, Sequence *deleting_sequence) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *current_sequence; SEQP_BEGIN(ed, current_sequence) @@ -657,7 +657,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) { TransSeq ts; Sequence *seqn = NULL; - int skip_dup = FALSE; + bool skip_dup = false; /* backup values */ ts.start = seq->start; @@ -678,7 +678,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) if ((seq->startstill) && (cutframe < seq->start)) { /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; seq->startstill = seq->start - cutframe; } else { @@ -699,11 +699,11 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) seq->endstill -= seq->enddisp - cutframe; /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; } } - BKE_sequence_reload_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); BKE_sequence_calc(scene, seq); if (!skip_dup) { @@ -743,7 +743,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence *seq, int cutframe) seqn->startstill = 0; } - BKE_sequence_reload_new_file(scene, seqn, FALSE); + BKE_sequence_reload_new_file(scene, seqn, false); BKE_sequence_calc(scene, seqn); } return seqn; @@ -753,7 +753,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) { TransSeq ts; Sequence *seqn = NULL; - int skip_dup = FALSE; + bool skip_dup = false; /* backup values */ ts.start = seq->start; @@ -774,7 +774,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) if ((seq->startstill) && (cutframe < seq->start)) { /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; seq->startstill = seq->start - cutframe; } else { @@ -793,7 +793,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe) seq->endstill -= seq->enddisp - cutframe; /* don't do funny things with METAs ... */ if (seq->type == SEQ_TYPE_META) { - skip_dup = TRUE; + skip_dup = true; } } @@ -891,7 +891,7 @@ static bool cut_seq_list(Scene *scene, ListBase *slist, int cutframe, static bool sequence_offset_after_frame(Scene *scene, const int delta, const int cfra) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); bool done = false; /* all strips >= cfra are shifted */ @@ -912,7 +912,7 @@ static bool sequence_offset_after_frame(Scene *scene, const int delta, const int static void UNUSED_FUNCTION(touch_seq_files) (Scene *scene) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); char str[256]; /* touch all strips with movies */ @@ -944,7 +944,7 @@ static void UNUSED_FUNCTION(touch_seq_files) (Scene *scene) static void set_filter_seq(Scene *scene) { Sequence *seq; - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed == NULL) return; @@ -956,7 +956,7 @@ static void set_filter_seq(Scene *scene) if (seq->flag & SELECT) { if (seq->type == SEQ_TYPE_MOVIE) { seq->flag |= SEQ_FILTERY; - reload_sequence_new_file(scene, seq, FALSE); + BKE_sequence_reload_new_file(scene, seq, false); BKE_sequence_calc(scene, seq); } @@ -969,7 +969,7 @@ static void set_filter_seq(Scene *scene) static void UNUSED_FUNCTION(seq_remap_paths) (Scene *scene) { Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); char from[FILE_MAX], to[FILE_MAX], stripped[FILE_MAX]; @@ -1120,14 +1120,14 @@ static int seq_get_snaplimit(View2D *v2d) /* Operator functions */ int sequencer_edit_poll(bContext *C) { - return (BKE_sequencer_editing_get(CTX_data_scene(C), FALSE) != NULL); + return (BKE_sequencer_editing_get(CTX_data_scene(C), false) != NULL); } #if 0 /* UNUSED */ int sequencer_strip_poll(bContext *C) { Editing *ed; - return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), FALSE)) != NULL) && (ed->act_seq != NULL)); + return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), false)) != NULL) && (ed->act_seq != NULL)); } #endif @@ -1135,13 +1135,13 @@ int sequencer_strip_has_path_poll(bContext *C) { Editing *ed; Sequence *seq; - return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), FALSE)) != NULL) && ((seq = ed->act_seq) != NULL) && (SEQ_HAS_PATH(seq))); + return (((ed = BKE_sequencer_editing_get(CTX_data_scene(C), false)) != NULL) && ((seq = ed->act_seq) != NULL) && (SEQ_HAS_PATH(seq))); } int sequencer_view_poll(bContext *C) { SpaceSeq *sseq = CTX_wm_space_seq(C); - Editing *ed = BKE_sequencer_editing_get(CTX_data_scene(C), FALSE); + Editing *ed = BKE_sequencer_editing_get(CTX_data_scene(C), false); if (ed && sseq && (sseq->mainb == SEQ_DRAW_IMG_IMBUF)) return 1; @@ -1153,7 +1153,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int snap_frame; @@ -1244,7 +1244,7 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot) static int sequencer_mute_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int selected; @@ -1295,7 +1295,7 @@ void SEQUENCER_OT_mute(struct wmOperatorType *ot) static int sequencer_unmute_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int selected; @@ -1346,7 +1346,7 @@ void SEQUENCER_OT_unmute(struct wmOperatorType *ot) static int sequencer_lock_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -1379,7 +1379,7 @@ void SEQUENCER_OT_lock(struct wmOperatorType *ot) static int sequencer_unlock_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -1412,7 +1412,7 @@ void SEQUENCER_OT_unlock(struct wmOperatorType *ot) static int sequencer_reload_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; const bool adjust_length = RNA_boolean_get(op->ptr, "adjust_length"); @@ -1458,9 +1458,9 @@ void SEQUENCER_OT_reload(struct wmOperatorType *ot) static int sequencer_refresh_all_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -1512,7 +1512,7 @@ static int sequencer_reassign_inputs_exec(bContext *C, wmOperator *op) static int sequencer_effect_poll(bContext *C) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *last_seq = BKE_sequencer_active_get(scene); @@ -1586,7 +1586,7 @@ static EnumPropertyItem prop_cut_types[] = { static int sequencer_cut_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); int cut_side, cut_hard, cut_frame; bool changed; @@ -1699,7 +1699,7 @@ static int apply_unique_name_cb(Sequence *seq, void *arg_pt) static int sequencer_add_duplicate_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ListBase nseqbase = {NULL, NULL}; @@ -1745,19 +1745,19 @@ void SEQUENCER_OT_duplicate(wmOperatorType *ot) static int sequencer_delete_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; MetaStack *ms; - int nothingSelected = TRUE; + bool nothingSelected = true; seq = BKE_sequencer_active_get(scene); if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */ - nothingSelected = FALSE; + nothingSelected = false; } else { for (seq = ed->seqbasep->first; seq; seq = seq->next) { if (seq->flag & SELECT) { - nothingSelected = FALSE; + nothingSelected = false; break; } } @@ -1837,7 +1837,7 @@ void SEQUENCER_OT_delete(wmOperatorType *ot) static int sequencer_offset_clear_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; /* for effects, try to find a replacement input */ @@ -1889,7 +1889,7 @@ void SEQUENCER_OT_offset_clear(wmOperatorType *ot) static int sequencer_separate_images_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *seq_new; Strip *strip_new; @@ -1909,8 +1909,8 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) /* if (seq->ipo) seq->ipo->id.us--; */ /* XXX, remove fcurve and assign to split image strips */ - start_ofs = cfra = BKE_sequence_tx_get_final_left(seq, 0); - frame_end = BKE_sequence_tx_get_final_right(seq, 0); + start_ofs = cfra = BKE_sequence_tx_get_final_left(seq, false); + frame_end = BKE_sequence_tx_get_final_right(seq, false); while (cfra < frame_end) { /* new seq */ @@ -1989,7 +1989,7 @@ void SEQUENCER_OT_images_separate(wmOperatorType *ot) static int sequencer_meta_toggle_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *last_seq = BKE_sequencer_active_get(scene); MetaStack *ms; @@ -2060,12 +2060,12 @@ void SEQUENCER_OT_meta_toggle(wmOperatorType *ot) static int sequencer_meta_make_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *seqm, *next, *last_seq = BKE_sequencer_active_get(scene); int channel_max = 1; - if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == FALSE) { + if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == false) { BKE_report(op->reports, RPT_ERROR, "Please select all related strips"); return OPERATOR_CANCELLED; } @@ -2135,7 +2135,7 @@ static int seq_depends_on_meta(Sequence *seq, Sequence *seqm) static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *last_seq = BKE_sequencer_active_get(scene); /* last_seq checks (ed == NULL) */ @@ -2364,7 +2364,7 @@ static int sequencer_view_selected_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); View2D *v2d = UI_view2d_fromcontext(C); ARegion *ar = CTX_wm_region(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *last_seq = BKE_sequencer_active_get(scene); Sequence *seq; rctf cur_new = v2d->cur; @@ -2445,7 +2445,7 @@ static int find_next_prev_edit(Scene *scene, int cfra, const short side, const bool do_skip_mute, const bool do_center) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *best_seq = NULL, *frame_seq = NULL; int dist, best_dist; @@ -2547,8 +2547,8 @@ static int sequencer_strip_jump_exec(bContext *C, wmOperator *op) const bool next = RNA_boolean_get(op->ptr, "next"); const bool center = RNA_boolean_get(op->ptr, "center"); - /* currently do_skip_mute is always TRUE */ - if (!strip_jump_internal(scene, next ? SEQ_SIDE_RIGHT : SEQ_SIDE_LEFT, TRUE, center)) { + /* currently do_skip_mute is always true */ + if (!strip_jump_internal(scene, next ? SEQ_SIDE_RIGHT : SEQ_SIDE_LEFT, true, center)) { return OPERATOR_CANCELLED; } @@ -2594,7 +2594,7 @@ static void swap_sequence(Scene *scene, Sequence *seqa, Sequence *seqb) #if 0 static Sequence *sequence_find_parent(Scene *scene, Sequence *child) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *parent = NULL; Sequence *seq; @@ -2614,7 +2614,7 @@ static Sequence *sequence_find_parent(Scene *scene, Sequence *child) static int sequencer_swap_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *active_seq = BKE_sequencer_active_get(scene); Sequence *seq, *iseq; int side = RNA_enum_get(op->ptr, "side"); @@ -2762,13 +2762,13 @@ static void seq_copy_del_sound(Scene *scene, Sequence *seq) static int sequencer_copy_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); ListBase nseqbase = {NULL, NULL}; BKE_sequencer_free_clipboard(); - if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == FALSE) { + if (BKE_sequence_base_isolated_sel_check(ed->seqbasep) == false) { BKE_report(op->reports, RPT_ERROR, "Please select all related strips"); return OPERATOR_CANCELLED; } @@ -2834,7 +2834,7 @@ static int sequencer_paste_exec(bContext *C, wmOperator *UNUSED(op)) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, TRUE); /* create if needed */ + Editing *ed = BKE_sequencer_editing_get(scene, true); /* create if needed */ ListBase nseqbase = {NULL, NULL}; int ofs; Sequence *iseq, *iseq_first; @@ -2955,7 +2955,7 @@ void SEQUENCER_OT_swap_data(wmOperatorType *ot) static int view_ghost_border_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); View2D *v2d = UI_view2d_fromcontext(C); rctf rect; @@ -3047,7 +3047,7 @@ static EnumPropertyItem prop_change_effect_input_types[] = { static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); Sequence **seq_1, **seq_2; @@ -3078,7 +3078,7 @@ static int sequencer_change_effect_input_exec(bContext *C, wmOperator *op) BKE_sequencer_update_changed_seq_and_deps(scene, seq, 0, 1); /* important else we don't get the imbuf cache flushed */ - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -3105,7 +3105,7 @@ void SEQUENCER_OT_change_effect_input(struct wmOperatorType *ot) static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); const int new_type = RNA_enum_get(op->ptr, "type"); @@ -3138,7 +3138,7 @@ static int sequencer_change_effect_type_exec(bContext *C, wmOperator *op) BKE_sequencer_update_changed_seq_and_deps(scene, seq, 0, 1); /* important else we don't get the imbuf cache flushed */ - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene); @@ -3166,7 +3166,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); const int is_relative_path = RNA_boolean_get(op->ptr, "relative_path"); @@ -3206,12 +3206,12 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) /* correct start/end frames so we don't move * important not to set seq->len = len; allow the function to handle it */ - BKE_sequence_reload_new_file(scene, seq, TRUE); + BKE_sequence_reload_new_file(scene, seq, true); BKE_sequence_calc(scene, seq); /* important else we don't get the imbuf cache flushed */ - BKE_sequencer_free_imbuf(scene, &ed->seqbase, FALSE); + BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); } else { /* lame, set rna filepath */ diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index a0212bd17fa..60fc300da1f 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -52,7 +52,7 @@ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa); /* sequencer_draw.c */ void draw_timeline_seq(const struct bContext *C, struct ARegion *ar); -void draw_image_seq(const struct bContext *C, struct Scene *scene, struct ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, int draw_overlay); +void draw_image_seq(const struct bContext *C, struct Scene *scene, struct ARegion *ar, struct SpaceSeq *sseq, int cfra, int offset, bool draw_overlay); /* UNUSED */ // void seq_reset_imageofs(struct SpaceSeq *sseq); diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c index 9850c7c3493..d3057645972 100644 --- a/source/blender/editors/space_sequencer/sequencer_modifier.c +++ b/source/blender/editors/space_sequencer/sequencer_modifier.c @@ -65,7 +65,7 @@ static int strip_modifier_active_poll(bContext *C) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (ed) { Sequence *seq = BKE_sequencer_active_get(scene); diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index c8178259dc2..cc97f7108ce 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -164,7 +164,7 @@ void select_surround_from_last(Scene *scene) void ED_sequencer_select_sequence_single(Scene *scene, Sequence *seq, bool deselect_all) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); if (deselect_all) ED_sequencer_deselect_all(scene); @@ -221,7 +221,7 @@ static int sequencer_de_select_all_exec(bContext *C, wmOperator *op) int action = RNA_enum_get(op->ptr, "action"); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; if (action == SEL_TOGGLE) { @@ -282,7 +282,7 @@ void SEQUENCER_OT_select_all(struct wmOperatorType *ot) static int sequencer_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -319,7 +319,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e { View2D *v2d = UI_view2d_fromcontext(C); Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); const bool extend = RNA_boolean_get(op->ptr, "extend"); const bool linked_handle = RNA_boolean_get(op->ptr, "linked_handle"); const bool linked_time = RNA_boolean_get(op->ptr, "linked_time"); @@ -338,7 +338,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e // XXX - not nice, Ctrl+RMB needs to do left_right only when not over a strip if (seq && linked_time && left_right) - left_right = FALSE; + left_right = false; if (marker) { @@ -555,7 +555,7 @@ void SEQUENCER_OT_select(wmOperatorType *ot) /* run recursively to select linked */ static bool select_more_less_seq__internal(Scene *scene, bool sel, const bool linked) { - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *neighbor; bool changed = false; int isel; @@ -757,7 +757,7 @@ void SEQUENCER_OT_select_linked(wmOperatorType *ot) static int sequencer_select_handles_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, 0); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq; int sel_side = RNA_enum_get(op->ptr, "side"); @@ -807,7 +807,7 @@ void SEQUENCER_OT_select_handles(wmOperatorType *ot) static int sequencer_select_active_side_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, 0); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq_act = BKE_sequencer_active_get(scene); if (ed == NULL || seq_act == NULL) @@ -845,7 +845,7 @@ void SEQUENCER_OT_select_active_side(wmOperatorType *ot) static int sequencer_borderselect_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(scene, false); View2D *v2d = UI_view2d_fromcontext(C); Sequence *seq; @@ -1044,16 +1044,16 @@ static bool select_grouped_effect(Editing *ed, Sequence *actseq) { Sequence *seq; bool changed = false; - short effects[SEQ_TYPE_EFFECT_MAX + 1]; + bool effects[SEQ_TYPE_EFFECT_MAX + 1]; int i; for (i = 0; i <= SEQ_TYPE_EFFECT_MAX; i++) - effects[i] = FALSE; + effects[i] = false; SEQP_BEGIN (ed, seq) { if (ELEM3(actseq, seq->seq1, seq->seq2, seq->seq3)) { - effects[seq->type] = TRUE; + effects[seq->type] = true; } } SEQ_END; @@ -1107,7 +1107,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) actseq->tmp = SET_INT_IN_POINTER(TRUE); - for (BKE_sequence_iterator_begin(ed, &iter, TRUE); iter.valid; BKE_sequence_iterator_next(&iter)) { + for (BKE_sequence_iterator_begin(ed, &iter, true); iter.valid; BKE_sequence_iterator_next(&iter)) { seq = iter.seq; /* Ignore all seqs already selected! */ @@ -1136,7 +1136,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) /* Unfortunately, we must restart checks from the beginning. */ BKE_sequence_iterator_end(&iter); - BKE_sequence_iterator_begin(ed, &iter, TRUE); + BKE_sequence_iterator_begin(ed, &iter, true); } /* Video strips bellow active one, or any strip for audio (order do no matters here!). */ @@ -1157,7 +1157,7 @@ static bool select_grouped_effect_link(Editing *ed, Sequence *actseq) static int sequencer_select_grouped_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, 0); + Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq, *actseq = BKE_sequencer_active_get(scene); int type = RNA_enum_get(op->ptr, "type"); bool changed = false, extend; diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index f39b30adf37..74fd22b4226 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -219,7 +219,7 @@ static void sample_cancel(bContext *C, wmOperator *op) static int sample_poll(bContext *C) { SpaceSeq *sseq = CTX_wm_space_seq(C); - return sseq && BKE_sequencer_editing_get(CTX_data_scene(C), FALSE) != NULL; + return sseq && BKE_sequencer_editing_get(CTX_data_scene(C), false) != NULL; } void SEQUENCER_OT_sample(wmOperatorType *ot) diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 1f7b70a52a9..03d74d1952f 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -544,7 +544,7 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar) if (sseq->mainb == SEQ_DRAW_SEQUENCE) sseq->mainb = SEQ_DRAW_IMG_IMBUF; if (!show_split || sseq->overlay_type != SEQ_DRAW_OVERLAY_REFERENCE) - draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 0, FALSE); + draw_image_seq(C, scene, ar, sseq, scene->r.cfra, 0, false); if (show_split && sseq->overlay_type != SEQ_DRAW_OVERLAY_CURRENT) { int over_cfra; @@ -555,7 +555,7 @@ static void sequencer_preview_area_draw(const bContext *C, ARegion *ar) over_cfra = scene->r.cfra + scene->ed->over_ofs; if (over_cfra != scene->r.cfra || sseq->overlay_type != SEQ_DRAW_OVERLAY_RECT) - draw_image_seq(C, scene, ar, sseq, scene->r.cfra, over_cfra - scene->r.cfra, TRUE); + draw_image_seq(C, scene, ar, sseq, scene->r.cfra, over_cfra - scene->r.cfra, true); } if ((U.uiflag & USER_SHOW_FPS) && ED_screen_animation_playing(wm)) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index e7a6e1460a4..10575eb0d53 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2426,7 +2426,7 @@ BLI_INLINE void trans_update_seq(Scene *sce, Sequence *seq, int old_start, int s void flushTransSeq(TransInfo *t) { - ListBase *seqbasep = BKE_sequencer_editing_get(t->scene, FALSE)->seqbasep; /* Editing null check already done */ + ListBase *seqbasep = BKE_sequencer_editing_get(t->scene, false)->seqbasep; /* Editing null check already done */ int a, new_frame; TransData *td = NULL; TransData2D *td2d = NULL; @@ -4156,8 +4156,8 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count Scene *scene = t->scene; int cfra = CFRA; - int left = BKE_sequence_tx_get_final_left(seq, 1); - int right = BKE_sequence_tx_get_final_right(seq, 1); + int left = BKE_sequence_tx_get_final_left(seq, true); + int right = BKE_sequence_tx_get_final_right(seq, true); if (seq->depth == 0 && ((seq->flag & SELECT) == 0 || (seq->flag & SEQ_LOCK))) { *recursive = FALSE; @@ -4292,16 +4292,16 @@ static TransData *SeqToTransData(TransData *td, TransData2D *td2d, TransDataSeq /* Use seq_tx_get_final_left() and an offset here * so transform has the left hand location of the strip. * tdsq->start_offset is used when flushing the tx data back */ - start_left = BKE_sequence_tx_get_final_left(seq, 0); + start_left = BKE_sequence_tx_get_final_left(seq, false); td2d->loc[0] = start_left; tdsq->start_offset = start_left - seq->start; /* use to apply the original location */ break; case SEQ_LEFTSEL: - start_left = BKE_sequence_tx_get_final_left(seq, 0); + start_left = BKE_sequence_tx_get_final_left(seq, false); td2d->loc[0] = start_left; break; case SEQ_RIGHTSEL: - td2d->loc[0] = BKE_sequence_tx_get_final_right(seq, 0); + td2d->loc[0] = BKE_sequence_tx_get_final_right(seq, false); break; } @@ -4388,7 +4388,7 @@ static int SeqToTransData_Recursive(TransInfo *t, ListBase *seqbase, TransData * static void freeSeqData(TransInfo *t) { - Editing *ed = BKE_sequencer_editing_get(t->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(t->scene, false); if (ed != NULL) { ListBase *seqbasep = ed->seqbasep; @@ -4563,7 +4563,7 @@ static void createTransSeqData(bContext *C, TransInfo *t) View2D *v2d = UI_view2d_fromcontext(C); Scene *scene = t->scene; - Editing *ed = BKE_sequencer_editing_get(t->scene, FALSE); + Editing *ed = BKE_sequencer_editing_get(t->scene, false); TransData *td = NULL; TransData2D *td2d = NULL; TransDataSeq *tdsq = NULL; -- cgit v1.2.3