From a55eac5107ed54597197e721eee0ad8d6f14a98f Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Sat, 27 Jun 2020 12:00:04 -0400 Subject: UI: Better Grouping of FFmpeg audio settings Some audio render settings were hidden in the scene properties. These settomgs belong in the render properties as they affect the output when using ffmpeg video. Fixes T49241 Differential Revision: https://developer.blender.org/D8137 --- release/scripts/startup/bl_ui/properties_output.py | 2 ++ release/scripts/startup/bl_ui/properties_scene.py | 13 +------------ 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py index 5f0fd3374d2..69c557d336f 100644 --- a/release/scripts/startup/bl_ui/properties_output.py +++ b/release/scripts/startup/bl_ui/properties_output.py @@ -411,6 +411,8 @@ class RENDER_PT_encoding_audio(RenderOutputButtonsPanel, Panel): layout.prop(ffmpeg, "audio_codec", text="Audio Codec") if ffmpeg.audio_codec != 'NONE': + layout.prop(ffmpeg, "audio_channels") + layout.prop(ffmpeg, "audio_mixrate", text="Sample Rate") layout.prop(ffmpeg, "audio_bitrate") layout.prop(ffmpeg, "audio_volume", slider=True) diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 0b4ca2902c1..22f455fe5be 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -289,8 +289,6 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel): layout.use_property_split = True scene = context.scene - rd = context.scene.render - ffmpeg = rd.ffmpeg flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=True) @@ -299,17 +297,8 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel): col.separator() - col.prop(scene, "audio_distance_model") - col.prop(ffmpeg, "audio_channels") - - col.separator() - - col = flow.column() - col.prop(ffmpeg, "audio_mixrate", text="Sample Rate") - - col.separator() - col = col.column(align=True) + col.prop(scene, "audio_distance_model") col.prop(scene, "audio_doppler_speed", text="Doppler Speed") col.prop(scene, "audio_doppler_factor", text="Doppler Factor") -- cgit v1.2.3