8 files changed, 10 insertions, 10 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject c39d35159117ea69644ee1ebe0004398b0996b2
+Subproject ad82c4ce43ef2801ef51e75af1f9702992478b0
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject f05763b347926198316aae24938914c1de7560a
+Subproject 8e6f485cf5b160c425d7da7c743879b20f3d6a9
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 9468c406fb554e32ff47b62bfef356b3908ec65
+Subproject 7077ff07384491d1f7630484995557f1c7302da
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index af50e61eb2d..847adf56a93 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -117,8 +117,8 @@ void BKE_sound_ensure_scene(struct Scene *scene);
 
 void BKE_sound_destroy_scene(struct Scene *scene);
 
-void BKE_sound_lock_scene(struct Scene *scene);
-void BKE_sound_unlock_scene(struct Scene *scene);
+void BKE_sound_lock();
+void BKE_sound_unlock();
 
 void BKE_sound_reset_scene_specs(struct Scene *scene);
 
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index f0545ae56bd..a06f73b2003 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -550,12 +550,12 @@ void BKE_sound_destroy_scene(Scene *scene)
   }
 }
 
-void BKE_sound_lock_scene(struct Scene *UNUSED(scene))
+void BKE_sound_lock()
 {
   AUD_Device_lock(sound_device);
 }
 
-void BKE_sound_unlock_scene(struct Scene *UNUSED(scene))
+void BKE_sound_unlock()
 {
   AUD_Device_unlock(sound_device);
 }
@@ -1161,10 +1161,10 @@ void BKE_sound_create_scene(Scene *UNUSED(scene))
 void BKE_sound_destroy_scene(Scene *UNUSED(scene))
 {
 }
-void BKE_sound_lock_scene(Scene *UNUSED(scene))
+void BKE_sound_lock()
 {
 }
-void BKE_sound_unlock_scene(Scene *UNUSED(scene))
+void BKE_sound_unlock()
 {
 }
 void BKE_sound_reset_scene_specs(Scene *UNUSED(scene))
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 36d0138f697..32b2d0b93c1 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
@@ -46,7 +46,7 @@ void SceneBackup::reset()
 
 void SceneBackup::init_from_scene(Scene *scene)
 {
-  BKE_sound_lock_scene(scene);
+  BKE_sound_lock();
 
   sound_scene = scene->sound_scene;
   playback_handle = scene->playback_handle;
@@ -80,7 +80,7 @@ void SceneBackup::restore_to_scene(Scene *scene)
 
   sequencer_backup.restore_to_scene(scene);
 
-  BKE_sound_unlock_scene(scene);
+  BKE_sound_unlock();
 
   reset();
 }
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 64cde724401..17d697840a0 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -217,10 +217,10 @@ static void sound_jack_sync_callback(Main *bmain, int mode, float time)
     if (depsgraph == NULL) {
       continue;
     }
-    BKE_sound_lock_scene(scene);
+    BKE_sound_lock();
     Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
     BKE_sound_jack_scene_update(scene_eval, mode, time);
-    BKE_sound_unlock_scene(scene);
+    BKE_sound_unlock();
   }
 }
 
diff --git a/source/tools b/source/tools
-Subproject 4a6f1706258439db3ee5a50ec6938fef79c7cb9
+Subproject 2afbb8ec472cac5102eb239f57b006f8c938768