[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29630] trunk/blender: == Sequencer ==

[Peter Schlaile]

Revision: 29630
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29630
Author:   schlaile
Date:     2010-06-22 23:09:50 +0200 (Tue, 22 Jun 2010)

Log Message:
-----------
== 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.)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/source/blender/blenkernel/intern/seqeffects.c
    trunk/blender/source/blender/makesrna/intern/rna_sequencer.c

Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py	2010-06-22 20:04:42 UTC (rev 29629)
+++ trunk/blender/release/scripts/ui/space_sequencer.py	2010-06-22 21:09:50 UTC (rev 29630)
@@ -351,7 +351,6 @@
 
         row = layout.row()
         row.prop(strip, "lock")
-        row.prop(strip, "frame_locked", text="Frame Lock")
 
         col = layout.column()
         col.enabled = not strip.lock

Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2010-06-22 20:04:42 UTC (rev 29629)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c	2010-06-22 21:09:50 UTC (rev 29630)
@@ -2802,7 +2802,7 @@
 	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 @@
 
 		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 @@
 		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) {

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2010-06-22 20:04:42 UTC (rev 29629)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer.c	2010-06-22 21:09:50 UTC (rev 29630)
@@ -706,11 +706,6 @@
 	RNA_def_property_ui_text(prop, "Mute", "");
 	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_mute_update");
 
-	prop= RNA_def_property(srna, "frame_locked", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_IPO_FRAME_LOCKED);
-	RNA_def_property_ui_text(prop, "Frame Locked", "Lock the animation curve to the global frame counter");
-	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update");
-
 	prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_LOCK);
 	RNA_def_property_ui_text(prop, "Lock", "Lock strip so that it can't be transformed");