== Sequencer (includes a little bit of Peach :) ==

Reworked image / movie loading, to add the following features:

- Mute strip
- Lock strip (peach request :)
- Crop / Translate _before_ image rescaling
- N-keys editing of start, startofs, endofs, startstill, endstill

Added (currently disabled) data structures for

- proxy support
- strip blend modes (currently only "REPLACE" works, which always did :)

Planed:

- automatic FPS rescaling
- command keys to lock/mute a bunch of selected strips 
  (which would complete the peach request to lock tracks)

Caveats: now the N-keys dialog is four-tabbed. I think, we should move those
tabs into the panels dialog in the future...

1 files changed, 6 insertions, 4 deletions

diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index c3264812c4b..8b3b2dd6082 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -2907,7 +2907,8 @@ void transform_seq(int mode, int context)
 	
 	if (seqar) {
 		for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
-			if(seq->flag & SELECT) totstrip++;
+			if((seq->flag & SELECT) && !(seq->flag & SEQ_LOCK)) 
+				totstrip++;
 		}
 	}
 	
@@ -2929,7 +2930,7 @@ void transform_seq(int mode, int context)
 	ts=transmain= MEM_callocN(totstrip*sizeof(TransSeq), "transseq");
 
 	for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
-		if(seq->flag & SELECT) {
+		if((seq->flag & SELECT) && !(seq->flag & SEQ_LOCK)) {
 			ts->start= seq->start;
 			ts->machine= seq->machine;
 			ts->startstill= seq->startstill;
@@ -3612,7 +3613,8 @@ void seq_snap(short event)
 
 	/* also check metas */
 	WHILE_SEQ(ed->seqbasep) {
-		if (seq->flag & SELECT && sequence_is_free_transformable(seq)) {
+		if (seq->flag & SELECT && !(seq->flag & SEQ_LOCK) &&
+		    sequence_is_free_transformable(seq)) {
 			if((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) {
 				seq->start= CFRA-seq->startofs+seq->startstill;
 			} else { 
@@ -3630,7 +3632,7 @@ void seq_snap(short event)
 
 	/* test for effects and overlap */
 	WHILE_SEQ(ed->seqbasep) {
-		if(seq->flag & SELECT) {
+		if(seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) {
 			seq->flag &= ~SEQ_OVERLAP;
 			if( test_overlap_seq(seq) ) {
 				shuffle_seq(seq);