diff options
| author | Peter Schlaile <peter@schlaile.de> | 2010-05-30 23:33:26 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2010-05-30 23:33:26 +0400 |
| commit | fe83427cc93fce0fad272780bba96ecd140dc78a (patch) | |
| tree | c1ee0124d8770884cccb6a197f65a7c80748140e /source/blender/blenloader | |
| parent | c2580dd639f26a26b54d8b8bb65dda49c84b12d0 (diff) | |
== Sequencer ==
This fixes loading of hard trimmed audio files in readfile
and adds trim options to N-keys for audio files.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b0574e7b622..61685ccefce 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4174,7 +4174,7 @@ static void lib_link_scene(FileData *fd, Main *main) if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo); if(seq->scene) { seq->scene= newlibadr(fd, sce->id.lib, seq->scene); - seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs); + seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs); } if(seq->scene_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera); if(seq->sound) { @@ -4185,7 +4185,7 @@ static void lib_link_scene(FileData *fd, Main *main) seq->sound= newlibadr(fd, sce->id.lib, seq->sound); if (seq->sound) { seq->sound->id.us++; - seq->scene_sound = sound_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs); + seq->scene_sound = sound_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs); } } seq->anim= 0; |