Removing gaps will now also move the scene markers, unless markers are
authorAntony Riakiotakis <kalast@gmail.com>
Wed, 1 Jul 2015 14:25:28 +0000 (16:25 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Wed, 1 Jul 2015 14:25:28 +0000 (16:25 +0200)
locked

source/blender/editors/space_sequencer/sequencer_edit.c

index 7c43720ae2bac3bdca773f5264ed27b5bc92703e..8030efbf7565e6f90ab664b115c55a4ba343684b 100644 (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) {