blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

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
This commit is contained in:
Aaron Carlisle 2020-06-27 12:00:04 -04:00
parent 9f5fae1f2c
commit a55eac5107
Notes: blender-bot 2023-02-14 11:34:30 +01:00 
Referenced by issue #49241, Consolidation of FFmpeg/Audio Options
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_output.py
View File

@ -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)

13
release/scripts/startup/bl_ui/properties_scene.py
View File

@ -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")