== Sequencer ==

Removed "frame_locked"-flag from sequencer completely, since it doesn't 
work any more in Blender 2.5. (All IPOs are frame-locked now anyways.)

1 files changed, 5 insertions, 17 deletions

diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index b5f9c8fe542..56a8edcc4fc 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2802,7 +2802,7 @@ static void init_speed_effect(Sequence *seq)
 	v = (SpeedControlVars *)seq->effectdata;
 	v->globalSpeed = 1.0;
 	v->frameMap = 0;
-	v->flags = SEQ_SPEED_COMPRESS_IPO_Y;
+	v->flags = 0;
 	v->length = 0;
 }
 
@@ -2925,14 +2925,8 @@ void sequence_effect_speed_rebuild_map(Scene *scene, Sequence * seq, int force)
 
 		for (cfra = 1; cfra < v->length; cfra++) {
 			if(fcu) {
-				if((seq->flag & SEQ_IPO_FRAME_LOCKED) != 0) {
-					ctime = seq->startdisp + cfra;
-					div = 1.0;
-				} else {
-					ctime= cfra;
-					div= v->length / 100.0f;
-					if(div==0.0) return;
-				}
+				ctime = seq->startdisp + cfra;
+				div = 1.0;
 				
 				facf = evaluate_fcurve(fcu, ctime/div);
 			} else {
@@ -2956,14 +2950,8 @@ void sequence_effect_speed_rebuild_map(Scene *scene, Sequence * seq, int force)
 		for (cfra = 0; cfra < v->length; cfra++) {
 
 			if(fcu) {
-				if((seq->flag & SEQ_IPO_FRAME_LOCKED) != 0) {
-					ctime = seq->startdisp + cfra;
-					div = 1.0;
-				} else {
-					ctime= cfra;
-					div= v->length / 100.0f;
-					if(div==0.0) return;
-				}
+				ctime = seq->startdisp + cfra;
+				div = 1.0;
 				
 				facf = evaluate_fcurve(fcu, ctime / div);
 				if (v->flags & SEQ_SPEED_COMPRESS_IPO_Y) {