diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:30:37 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:30:37 +0300 |
| commit | 90f0e372637178de107dbe161f1e24561ef9513d (patch) | |
| tree | f7721f0c52eaef89e306f53514a35500d576015e /source/blender/src/editipo.c | |
| parent | f17bdcb2e4da09caaeb53b0ca7d8e881d79f901e (diff) | |
* Adds configuration buttons for ffmpeg-output
* Large sequencer rewrite to support:
- Audio-tracks, which are not completely loaded into memory (hdaudio) but
kept on disk instead.
- A dependency tree, that builds only the Imbufs, that are really needed
- Cleaner sequencer code
- Per instance data in sequencer plugins (without this, the Dynamic
Noise Reduction plugin would be impossible)
- A Luma Waveform display
- A U/V scatter plot display
- Memcache limiting in sequencer
- Buttons changed according to the boosted framecount limit
Diffstat (limited to 'source/blender/src/editipo.c')
| -rw-r--r-- | source/blender/src/editipo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index e6a98b4b004..b8953a63fc6 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -988,7 +988,7 @@ static void get_ipo_context(short blocktype, ID **from, Ipo **ipo, char *actname else if(blocktype==ID_SEQ) { extern Sequence *last_seq; - if(last_seq && ((last_seq->type & SEQ_EFFECT)||(last_seq->type == SEQ_SOUND))) { + if(last_seq && ((last_seq->type & SEQ_EFFECT)||(last_seq->type == SEQ_HD_SOUND)||(last_seq->type == SEQ_RAM_SOUND))) { *from= (ID *)last_seq; *ipo= last_seq->ipo; } @@ -1700,7 +1700,9 @@ Ipo *verify_ipo(ID *from, short blocktype, char *actname, char *constname) { Sequence *seq= (Sequence *)from; /* note, sequence is mimicing Id */ - if((seq->type & SEQ_EFFECT)||(seq->type == SEQ_SOUND)) { + if((seq->type & SEQ_EFFECT)|| + (seq->type == SEQ_RAM_SOUND)|| + (seq->type == SEQ_HD_SOUND)) { if(seq->ipo==NULL) { seq->ipo= add_ipo("SeqIpo", ID_SEQ); } |