diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-07-28 22:42:26 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-07-28 22:42:26 +0400 |
| commit | f7b291790890580b5a297405cc32421c11b9a3cf (patch) | |
| tree | 2607d5320144468cee6ce01a487ad2d3fd0742f4 /source/blender/blenloader/intern/readfile.c | |
| parent | 154c7c97f4fb0b2a54c13c4155b1dd33c3b2f9dc (diff) | |
Sound Branch
Sequencer audio update, still not perfect, but improving.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 057ebd51a29..301b3455202 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3993,7 +3993,7 @@ static void lib_link_scene(FileData *fd, Main *main) } } seq->anim= 0; - seq->hdaudio = 0; +// AUD_XXX seq->hdaudio = 0; } SEQ_END @@ -4971,7 +4971,7 @@ static void lib_link_sound(FileData *fd, Main *main) if(sound->id.flag & LIB_NEEDLINK) { sound->id.flag -= LIB_NEEDLINK; sound->ipo= newlibadr_us(fd, sound->id.lib, sound->ipo); // XXX depreceated - old animation system -// AUD_XXX sound->stream = 0; + sound->stream = 0; } sound= sound->id.next; } @@ -9119,6 +9119,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) { sound->packedfile = sound->newpackedfile; sound->newpackedfile = NULL; + sound->type = SOUND_TYPE_FILE; } } @@ -9220,7 +9221,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main) bSound *sound; for(sound = main->sound.first; sound; sound = sound->id.next) + { + sound->snd_sound = NULL; sound_load(sound); + } for(ob = main->object.first; ob; ob = ob->id.next) { |