forked from bartvdbraak/blender
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.
This commit is contained in:
parent
175491deb4
commit
add697407a
@ -401,7 +401,7 @@ else
|
|||||||
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
|
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
|
||||||
NAN_SND_LIBS += $(SOUNDSYSTEM)
|
NAN_SND_LIBS += $(SOUNDSYSTEM)
|
||||||
else
|
else
|
||||||
ifeq ($OS),solaris)
|
ifeq ($(OS), solaris)
|
||||||
NAN_SND_LIBS = $(SOUNDSYSTEM)
|
NAN_SND_LIBS = $(SOUNDSYSTEM)
|
||||||
NAN_SND_LIBS += $(DUMMYSOUND)
|
NAN_SND_LIBS += $(DUMMYSOUND)
|
||||||
NAN_SND_LIBS += $(OPENALSOUND)
|
NAN_SND_LIBS += $(OPENALSOUND)
|
||||||
|
@ -203,14 +203,14 @@ void sound_initialize_sounds(void)
|
|||||||
/* clear the soundscene */
|
/* clear the soundscene */
|
||||||
SND_RemoveAllSounds(ghSoundScene);
|
SND_RemoveAllSounds(ghSoundScene);
|
||||||
SND_RemoveAllSamples(ghSoundScene);
|
SND_RemoveAllSamples(ghSoundScene);
|
||||||
|
}
|
||||||
|
|
||||||
/* initialize sounds */
|
/* initialize sample blocks (doesnt call audio system, needs to be done once after load */
|
||||||
sound = G.main->sound.first;
|
sound = G.main->sound.first;
|
||||||
while (sound)
|
while (sound)
|
||||||
{
|
{
|
||||||
sound_sample_is_null(sound);
|
sound_sample_is_null(sound);
|
||||||
sound = (bSound *) sound->id.next;
|
sound = (bSound *) sound->id.next;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user