Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-05-09 19:54:22 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-05-09 19:54:22 +0400
commit686fe23c9dfa11e978f21419fb0ea255b8b9054f (patch)
treefa3b2590428cd4f98ccb5fa93630aa6effbfa1d8 /source/blender/blenkernel/intern/sound.c
parentb52d55f2663ea1873d363836bc3cb97e4127a1a1 (diff)
Fix crash doing alt+A playback in files saved in version <= 2.34, this code runs
before the version patch which it ideally shouldn't, but moving it to a different location is tricky.
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
-rw-r--r--source/blender/blenkernel/intern/sound.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 84d2bf815bc..896d0f4cf08 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -391,6 +391,10 @@ AUD_Device *sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start,
void sound_create_scene(struct Scene *scene)
{
+ /* should be done in version patch, but this gets called before */
+ if (scene->r.frs_sec_base == 0)
+ scene->r.frs_sec_base = 1;
+
scene->sound_scene = AUD_createSequencer(FPS, scene->audio.flag & AUDIO_MUTE);
AUD_updateSequencerData(scene->sound_scene, scene->audio.speed_of_sound,
scene->audio.doppler_factor, scene->audio.distance_model);