[Bf-blender-cvs] [f4e8c0c104f] master: Anim UI: Playback Sync menu improvement

Sybren A. Stüvel noreply at git.blender.org
Thu Oct 29 12:47:08 CET 2020


Commit: f4e8c0c104f3efb66b36f15101dd16242cd43549
Author: Sybren A. Stüvel
Date:   Thu Oct 29 12:31:48 2020 +0100
Branches: master
https://developer.blender.org/rBf4e8c0c104f3efb66b36f15101dd16242cd43549

Anim UI: Playback Sync menu improvement

Relabel the Playback Synchronisation menu so that it's clear:
- what does happen (instead of describing what does //not// happen), and
- that the synchronisation options don't just affect audio.

The changes are:
- Change label from "Audio" to "Sync"
- Change the labels of the sync enum:
    - No Sync → Play Every Frame
    - Frame Dropping stays the same
    - AV-sync → Sync to Audio

The "Audio" label has moved one option down, as that option does
actually relate to audio.

Reviewed By: looch, Severin, HooglyBoogly, campbellbarton

Differential Revision: https://developer.blender.org/D9269

===================================================================

M	release/scripts/startup/bl_ui/space_time.py
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py
index 290bbdb1ab6..16b02db9377 100644
--- a/release/scripts/startup/bl_ui/space_time.py
+++ b/release/scripts/startup/bl_ui/space_time.py
@@ -241,8 +241,8 @@ class TIME_PT_playback(TimelinePanelButtons, Panel):
         screen = context.screen
         scene = context.scene
 
-        col = layout.column()
-        col.prop(scene, "sync_mode", text="Audio")
+        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")
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 62d5917bc10..7b7c1516b50 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7359,9 +7359,9 @@ void RNA_def_scene(BlenderRNA *brna)
   };
 
   static const EnumPropertyItem sync_mode_items[] = {
-      {0, "NONE", 0, "No Sync", "Do not sync, play every frame"},
+      {0, "NONE", 0, "Play Every Frame", "Do not sync, play every frame"},
       {SCE_FRAME_DROP, "FRAME_DROP", 0, "Frame Dropping", "Drop frames if playback is too slow"},
-      {AUDIO_SYNC, "AUDIO_SYNC", 0, "AV-sync", "Sync to audio playback, dropping frames"},
+      {AUDIO_SYNC, "AUDIO_SYNC", 0, "Sync to Audio", "Sync to audio playback, dropping frames"},
       {0, NULL, 0, NULL, NULL},
   };



More information about the Bf-blender-cvs mailing list