griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #114801: Scene.use_audio value flipped

Browse Source 
Regression in [0] caused the value to be flipped.

[0]: e37dc17991
This commit is contained in:
Campbell Barton
2024-01-18 11:01:13 +11:00
parent b8a340e630
commit d068407a00
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/startup/bl_ui/space_time.py
View File

@@ -248,7 +248,7 @@ class TIME_PT_playback(TimelinePanelButtons, Panel):
layout.prop(scene, "sync_mode", text="Sync")
col = layout.column(heading="Audio")
col.prop(scene, "use_audio_scrub", text="Scrubbing")
col.prop(scene, "use_audio", text="Mute")
col.prop(scene, "use_audio")
col = layout.column(heading="Playback")
col.prop(scene, "lock_frame_selection_to_range", text="Limit to Frame Range")

6
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -2123,14 +2123,14 @@ static int rna_Scene_transform_orientation_slots_length(PointerRNA * /*ptr*/)
static bool rna_Scene_use_audio_get(PointerRNA *ptr)
{
Scene *scene = (Scene *)ptr->data;
return (scene->audio.flag & AUDIO_MUTE) != 0;
return (scene->audio.flag & AUDIO_MUTE) == 0;
}
static void rna_Scene_use_audio_set(PointerRNA *ptr, bool value)
{
Scene *scene = (Scene *)ptr->data;
if (value) {
if (!value) {
scene->audio.flag |= AUDIO_MUTE;
}
else {
@@ -8671,7 +8671,7 @@ void RNA_def_scene(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_audio", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_Scene_use_audio_get", "rna_Scene_use_audio_set");
RNA_def_property_ui_text(
prop, "Audio Muted", "Play back of audio from Sequence Editor will be muted");
prop, "Play Audio", "Play back of audio from Sequence Editor, otherwise mute audio");
RNA_def_property_update(prop, NC_SCENE, "rna_Scene_use_audio_update");
# if 0 /* XXX: Is this actually needed? */