Commit: ca7219ddfffaf4c014be7aad565d545bb07ee9bc
Author: Antony Riakiotakis
Date: Thu Sep 25 16:59:34 2014 +0200
Branches: terrible_consequencer
https://developer.blender.org/rBca7219ddfffaf4c014be7aad565d545bb07ee9bc
Get rid of temporary flags when loading the sound.
===================================================================
M source/blender/blenloader/intern/readfile.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 09aaebf..c3005dc 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6746,8 +6746,11 @@ static void direct_link_speaker(FileData *fd, Speaker
*spk)
static void direct_link_sound(FileData *fd, bSound *sound)
{
- // versioning stuff, if there was a cache, then we enable caching:
+ /* versioning stuff, if there was a cache, then we enable caching: */
if (sound->cache) sound->flags |= SOUND_FLAGS_CACHING;
+
+ /* get rid of temporary flags */
+ sound->flags &= ~SOUND_FLAGS_WAVEFORM_LOADING;
if (fd->soundmap) {
sound->cache = newsoundadr(fd, sound->cache);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
