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:
authorJörg Müller <nexyon@gmail.com>2020-03-23 11:33:02 +0300
committerJörg Müller <nexyon@gmail.com>2020-03-23 11:34:26 +0300
commit0710fb724beb38cf76e0e9bce2c2b310027bef29 (patch)
treea689fa6316d0dcff67edd685de288d05858fd2e9 /source/blender/depsgraph/intern
parent46c0da6e69c38973e5616bb0a0f7f2ff7b43d5fa (diff)
Fix T72632: Blender crashes using Jack with AV Sync enabled (repeatable)
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc
index 9f47402790c..36d0138f697 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.cc
@@ -23,6 +23,8 @@
#include "intern/eval/deg_eval_runtime_backup_scene.h"
+#include "BKE_sound.h"
+
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"
@@ -44,6 +46,8 @@ void SceneBackup::reset()
void SceneBackup::init_from_scene(Scene *scene)
{
+ BKE_sound_lock_scene(scene);
+
sound_scene = scene->sound_scene;
playback_handle = scene->playback_handle;
sound_scrub_handle = scene->sound_scrub_handle;
@@ -76,6 +80,8 @@ void SceneBackup::restore_to_scene(Scene *scene)
sequencer_backup.restore_to_scene(scene);
+ BKE_sound_unlock_scene(scene);
+
reset();
}