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

Fix T55414: waveforms are reprocessed when undoing

Browse Source 
Add new tag to bSound (runtime flags), and make read code to set a 'no
reload waveform' new tag, since it uses a mapping to get existing
waveform in undo case...
This commit is contained in:
Bastien Montagne
2018-07-20 12:01:38 +02:00
parent 0bf8096501
commit f48e81e720
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/blenkernel/intern/sound.c
View File

@@ -757,15 +757,19 @@ int BKE_sound_scene_playing(struct Scene *scene)
void BKE_sound_free_waveform(bSound *sound)
{
SoundWaveform *waveform = sound->waveform;
if (waveform) {
if (waveform->data) {
MEM_freeN(waveform->data);
if ((sound->tags & SOUND_TAGS_WAVEFORM_NO_RELOAD) == 0) {
SoundWaveform *waveform = sound->waveform;
if (waveform) {
if (waveform->data) {
MEM_freeN(waveform->data);
}
MEM_freeN(waveform);
}
MEM_freeN(waveform);
}
sound->waveform = NULL;
sound->waveform = NULL;
}
/* This tag is only valid once. */
sound->tags &= ~SOUND_TAGS_WAVEFORM_NO_RELOAD;
}
void BKE_sound_read_waveform(bSound *sound, short *stop)