diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-01 17:25:28 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-01 17:25:28 +0300 |
commit | 1a44237d8210b6132a877a1d40a62e855fcbd4b0 (patch) | |
tree | 6a85884864b5b5e2875655ebf5ee402c974b501a /source/blender | |
parent | f525483d837f8f91876ba395134c3ed263dcc7c2 (diff) |
Removing gaps will now also move the scene markers, unless markers are
locked
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 7c43720ae2b..8030efbf756 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -900,6 +900,7 @@ static bool sequence_offset_after_frame(Scene *scene, const int delta, const int Sequence *seq; Editing *ed = BKE_sequencer_editing_get(scene, false); bool done = false; + TimeMarker *marker; /* all strips >= cfra are shifted */ @@ -913,6 +914,14 @@ static bool sequence_offset_after_frame(Scene *scene, const int delta, const int } } + if (!scene->toolsettings->lock_markers) { + for (marker = scene->markers.first; marker; marker = marker->next) { + if (marker->frame >= cfra) { + marker->frame += delta; + } + } + } + return done; } @@ -1035,7 +1044,7 @@ static int sequencer_gap_remove_exec(bContext *C, wmOperator *op) break; } } - + for ( ; cfra < efra; cfra++) { /* first == 0 means there's still no strip to remove a gap for */ if (first == false) { |