[Bf-blender-cvs] [1a44237] master: Removing gaps will now also move the scene markers, unless markers are locked

[Antony Riakiotakis]

Commit: 1a44237d8210b6132a877a1d40a62e855fcbd4b0
Author: Antony Riakiotakis
Date:   Wed Jul 1 16:25:28 2015 +0200
Branches: master
https://developer.blender.org/rB1a44237d8210b6132a877a1d40a62e855fcbd4b0

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

===================================================================

M	source/blender/editors/space_sequencer/sequencer_edit.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 7c43720..8030efb 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) {