[Bf-blender-cvs] [cdcb844d271] master: Fix T69684: Sound Strip "Pan" function is misleading

Richard Antalik noreply at git.blender.org
Mon Sep 30 01:47:49 CEST 2019


Commit: cdcb844d271f9d456c22d372f9349054140a94d7
Author: Richard Antalik
Date:   Sun Sep 29 16:14:00 2019 -0700
Branches: master
https://developer.blender.org/rBcdcb844d271f9d456c22d372f9349054140a94d7

Fix T69684: Sound Strip "Pan" function is misleading

Gray-out pan property when sound mono property is unset.

Reviewed By: billreynish

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

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

M	release/scripts/addons_contrib
M	release/scripts/startup/bl_ui/space_sequencer.py

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

diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 23b744fa47d..d9ed9d4d064 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 23b744fa47da73c0b6c5b41b02cfe0efa008ec5c
+Subproject commit d9ed9d4d064c74c86e2767cd4be32d602a0ee317
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 397355f1f23..a942b8769cf 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1571,10 +1571,13 @@ class SEQUENCER_PT_adjust_sound(SequencerButtonsPanel, Panel):
 
         col.prop(strip, "volume", text="Volume")
         col.prop(strip, "pitch")
+
+        col = layout.column()
         col.prop(strip, "pan")
+        col.enabled = sound is not None and sound.use_mono
 
         if sound is not None:
-
+            col = layout.column()
             if st.waveform_display_type == 'DEFAULT_WAVEFORMS':
                 col.prop(strip, "show_waveform")
             col.prop(sound, "use_mono")



More information about the Bf-blender-cvs mailing list