archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Sequencer ==

Browse Source 
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.)
This commit is contained in:
Peter Schlaile
2010-06-22 21:09:50 +00:00
parent 86de9694ff
commit df76cebb8a
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/ui/space_sequencer.py
View File

@@ -351,7 +351,6 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel):
row = layout.row()
row.prop(strip, "lock")
row.prop(strip, "frame_locked", text="Frame Lock")
col = layout.column()
col.enabled = not strip.lock

22
source/blender/blenkernel/intern/seqeffects.c
View File

@@ -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) {

5
source/blender/makesrna/intern/rna_sequencer.c
View File

@@ -706,11 +706,6 @@ static void rna_def_sequence(BlenderRNA *brna)
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");