blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Removing gaps will now also move the scene markers, unless markers are 

locked
This commit is contained in:
Antonis Ryakiotakis 2015-07-01 16:25:28 +02:00
parent f525483d83
commit 1a44237d82
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -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) {