archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Move bSound cache handling during undo to new system.

Browse Source
This commit is contained in:
Bastien Montagne
2020-07-03 12:55:50 +02:00
parent ae5529c848
commit aab41401f9
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenloader/intern/readblenentry.c
View File

@@ -399,9 +399,6 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain,
/* makes lookup of existing video clips in old main */
blo_make_movieclip_pointer_map(fd, oldmain);
/* make lookups of existing sound data in old main */
blo_make_sound_pointer_map(fd, oldmain);
/* make lookups of existing volume data in old main */
blo_make_volume_pointer_map(fd, oldmain);
@@ -422,9 +419,6 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain,
/* ensures relinked movie clips are not freed */
blo_end_movieclip_pointer_map(fd, oldmain);
/* ensures relinked sounds are not freed */
blo_end_sound_pointer_map(fd, oldmain);
/* ensures relinked volumes are not freed */
blo_end_volume_pointer_map(fd, oldmain);

6
source/blender/blenloader/intern/readfile.c
View File

@@ -8408,13 +8408,9 @@ static void direct_link_sound(BlendDataReader *reader, bSound *sound)
sound->cache = NULL;
}
if (reader->fd->soundmap) {
sound->waveform = newsoundadr(reader->fd, sound->waveform);
if (reader->fd->memfile != NULL) {
sound->tags |= SOUND_TAGS_WAVEFORM_NO_RELOAD;
}
else {
sound->waveform = NULL;
}
sound->spinlock = MEM_mallocN(sizeof(SpinLock), "sound_spinlock");
BLI_spin_init(sound->spinlock);