Skip to content

Commit

Permalink
Cleanup: Removing unused parameter.
Browse files Browse the repository at this point in the history
  • Loading branch information
neXyon committed Mar 28, 2020
1 parent 10bd3fb commit bdec24b
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion release/datafiles/locale
Submodule locale updated 37 files
+6 −7 languages
+11 −11 po/ab.po
+2,763 −880 po/ar.po
+1,664 −584 po/ca.po
+2,029 −744 po/cs.po
+2,399 −4,563 po/de.po
+2 −2 po/eo.po
+7,315 −10,642 po/es.po
+7,315 −10,626 po/es_ES.po
+121 −70 po/eu.po
+864 −343 po/fa.po
+5,136 −8,455 po/fr.po
+2 −2 po/ha.po
+113 −67 po/he.po
+637 −371 po/hi.po
+6 −2 po/hr.po
+1,871 −1,281 po/hu.po
+431 −163 po/id.po
+4,247 −4,646 po/it.po
+12,485 −18,819 po/ja.po
+26,700 −47,480 po/ko.po
+250 −166 po/ky.po
+313 −143 po/nl.po
+740 −396 po/pl.po
+5,218 −2,026 po/pt.po
+5,292 −2,031 po/pt_BR.po
+6,142 −9,960 po/ru.po
+0 −102,888 po/sk.po
+1,916 −906 po/sr.po
+1,916 −906 po/[email protected]
+1,824 −631 po/sv.po
+386 −2,639 po/th.po
+1,661 −604 po/tr.po
+6,795 −18,211 po/uk.po
+12,476 −16,700 po/vi.po
+15,367 −43,132 po/zh_CN.po
+64,993 −7 po/zh_TW.po
2 changes: 1 addition & 1 deletion release/scripts/addons
Submodule addons updated 882 files
2 changes: 1 addition & 1 deletion release/scripts/addons_contrib
Submodule addons_contrib updated 411 files
4 changes: 2 additions & 2 deletions source/blender/blenkernel/BKE_sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions source/blender/blenkernel/intern/sound.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions source/blender/windowmanager/intern/wm_init_exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down

0 comments on commit bdec24b

Please sign in to comment.