diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-06-17 11:27:30 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-06-17 11:27:30 +0300 |
| commit | a39532670f6b668da7be5810fb1f844b82feeba3 (patch) | |
| tree | 4d6a40f6c362ca1d9b7c7031527e6e54a62589e6 /source/blender/editors/space_sequencer/sequencer_add.c | |
| parent | 7948150ca3683dc326c37609ded322d54b832d0d (diff) | |
| parent | 10981bc8c092dda48ed5228cc19108513035abf0 (diff) | |
Merge branch 'master' into xr-dev
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_add.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index ea6d3351eaa..647d13a4d56 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -340,7 +340,7 @@ static void seq_load_apply_generic_options(bContext *C, wmOperator *op, Sequence ScrArea *area = CTX_wm_area(C); const bool use_sync_markers = (((SpaceSeq *)area->spacedata.first)->flag & SEQ_MARKER_TRANS) != 0; - SEQ_transform_handle_overlap(scene, ed->seqbasep, strip_col, use_sync_markers); + SEQ_transform_handle_overlap(scene, ed->seqbasep, strip_col, NULL, use_sync_markers); SEQ_collection_free(strip_col); } @@ -863,7 +863,7 @@ static void sequencer_add_movie_multiple_strips(bContext *C, ScrArea *area = CTX_wm_area(C); const bool use_sync_markers = (((SpaceSeq *)area->spacedata.first)->flag & SEQ_MARKER_TRANS) != 0; - SEQ_transform_handle_overlap(scene, ed->seqbasep, strip_col, use_sync_markers); + SEQ_transform_handle_overlap(scene, ed->seqbasep, strip_col, NULL, use_sync_markers); } SEQ_collection_free(strip_col); @@ -913,7 +913,7 @@ static bool sequencer_add_movie_single_strip(bContext *C, ScrArea *area = CTX_wm_area(C); const bool use_sync_markers = (((SpaceSeq *)area->spacedata.first)->flag & SEQ_MARKER_TRANS) != 0; - SEQ_transform_handle_overlap(scene, ed->seqbasep, strip_col, use_sync_markers); + SEQ_transform_handle_overlap(scene, ed->seqbasep, strip_col, NULL, use_sync_markers); } SEQ_collection_free(strip_col); |