diff options
author | Ton Roosendaal <ton@blender.org> | 2004-12-09 16:46:38 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-12-09 16:46:38 +0300 |
commit | add697407af6e71f62744aa47141ffc0a8f24e1a (patch) | |
tree | ac2d40279610337ce3f5a8e1b321b776f89925f9 | |
parent | 175491deb4d972a6fad5e975f48b2e167ef34a89 (diff) |
Bug fix #1995
Unpacking a file with packed sounds didn't save the samples... was due
to *very* weird method samples were put in Blender.
-rw-r--r-- | source/Makefile | 2 | ||||
-rw-r--r-- | source/blender/src/editsound.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/Makefile b/source/Makefile index 6af0ec6aac0..27ff63c7445 100644 --- a/source/Makefile +++ b/source/Makefile @@ -401,7 +401,7 @@ else NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(SOUNDSYSTEM) else - ifeq ($OS),solaris) + ifeq ($(OS), solaris) NAN_SND_LIBS = $(SOUNDSYSTEM) NAN_SND_LIBS += $(DUMMYSOUND) NAN_SND_LIBS += $(OPENALSOUND) diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c index 5093a6f57a1..b47bf4c580e 100644 --- a/source/blender/src/editsound.c +++ b/source/blender/src/editsound.c @@ -203,14 +203,14 @@ void sound_initialize_sounds(void) /* clear the soundscene */ SND_RemoveAllSounds(ghSoundScene); SND_RemoveAllSamples(ghSoundScene); + } - /* initialize sounds */ - sound = G.main->sound.first; - while (sound) - { - sound_sample_is_null(sound); - sound = (bSound *) sound->id.next; - } + /* initialize sample blocks (doesnt call audio system, needs to be done once after load */ + sound = G.main->sound.first; + while (sound) + { + sound_sample_is_null(sound); + sound = (bSound *) sound->id.next; } } |