Made it so locked strips inside metastrips are transformed.

Removed FTYPE from render output panel - was some old format that did index colors, and wasn't even used anywhere.

Added 2 options to the render output panel that can be used for a really basic local renderfarm (even artists can use it!),
"NoOverwrite" and "Touch"
When both are enabled, rendering 1 scene between many pc's on a fast network will populate the directory with frames.
Also useful to delete frames that have errors and re-render (without manually re-rendering each frame)

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index e75a38d3a49..e0774fcae44 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -2872,10 +2872,10 @@ static void transform_grab_xlimits(Sequence *seq, int leftflag, int rightflag)
 
 static int can_transform_seq_test_func(Sequence * seq)
 {
-	if((seq->flag & SELECT) && !(seq->flag & SEQ_LOCK)) {
+	if((seq->flag & SELECT) && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 		return BUILD_SEQAR_COUNT_CURRENT | BUILD_SEQAR_COUNT_CHILDREN;
 	}
-	if ((seq->flag & SEQ_LOCK) && !(seq->type & SEQ_EFFECT)) {
+	if ((seq->depth==0 && seq->flag & SEQ_LOCK) && !(seq->type & SEQ_EFFECT)) {
 		if (seq->type != SEQ_META) {
 			return BUILD_SEQAR_COUNT_NOTHING;
 		} else {
@@ -2934,7 +2934,7 @@ 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) && !(seq->flag & SEQ_LOCK)) 
+			if((seq->flag & SELECT) && !(seq->depth==0 && seq->flag & SEQ_LOCK)) 
 				totstrip++;
 		}
 	}
@@ -2957,7 +2957,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) && !(seq->flag & SEQ_LOCK)) {
+		if((seq->flag & SELECT) && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 			ts->start= seq->start;
 			ts->machine= seq->machine;
 			ts->startstill= seq->startstill;
@@ -3143,7 +3143,7 @@ void transform_seq(int mode, int context)
 			if (mode=='g' && !snapskip) {
 				/* Grab */
 				for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
-					if(seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) {
+					if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 						int myofs;
 						// SEQ_DEBUG_INFO(seq);
 						
@@ -3195,7 +3195,7 @@ void transform_seq(int mode, int context)
 				
 				/* Extend, Similar to grab but operate on one side of the cursor */
 				for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
-					if(seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) {
+					if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 						/* only move the contents of the metastrip otherwise the transformation is applied twice */
 						if (sequence_is_free_transformable(seq) && seq->type != SEQ_META) {
 							
@@ -3307,7 +3307,7 @@ void transform_seq(int mode, int context)
 
 			/* test for effect and overlap */
 			for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
-				if((seq->depth==0) && (seq->flag & SELECT) && !(seq->flag & SEQ_LOCK)) {
+				if((seq->depth==0) && (seq->flag & SELECT) && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 					seq->flag &= ~SEQ_OVERLAP;
 					if( test_overlap_seq(seq) ) {
 						seq->flag |= SEQ_OVERLAP;
@@ -3358,7 +3358,7 @@ void transform_seq(int mode, int context)
 
 		ts= transmain;
 		for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
-			if(seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) {
+			if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 				seq->start= ts->start;
 				seq->machine= ts->machine;
 				seq->startstill= ts->startstill;
@@ -3376,7 +3376,7 @@ void transform_seq(int mode, int context)
 				else if(seq->seq3 && seq->seq3->flag & SELECT) calc_sequence(seq);
 			}
 		}
-		
+	
 		/* Markers */
 		if (sseq->flag & SEQ_MARKER_TRANS) {
 			for(a=0, marker= G.scene->markers.first; marker; marker= marker->next) {
@@ -3642,7 +3642,7 @@ void seq_snap(short event)
 
 	/* also check metas */
 	WHILE_SEQ(ed->seqbasep) {
-		if (seq->flag & SELECT && !(seq->flag & SEQ_LOCK) &&
+		if (seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK) &&
 		    sequence_is_free_transformable(seq)) {
 			if((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) {
 				seq->start= CFRA-seq->startofs+seq->startstill;
@@ -3661,7 +3661,7 @@ void seq_snap(short event)
 
 	/* test for effects and overlap */
 	WHILE_SEQ(ed->seqbasep) {
-		if(seq->flag & SELECT && !(seq->flag & SEQ_LOCK)) {
+		if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 			seq->flag &= ~SEQ_OVERLAP;
 			if( test_overlap_seq(seq) ) {
 				shuffle_seq(seq);