diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-23 19:55:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-23 19:55:25 +0300 |
| commit | f218e6d4da8dbfa4be809b46d6a6c923b7a6fc97 (patch) | |
| tree | c5a4d78be2a899547d36d0e5c1ba8036f2195373 | |
| parent | 6be95f87787de68fb55b86968ddeb7c2507bf4f9 (diff) | |
Fix T53276: encoding output quality UI clarification.
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 32 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 2f3adf546b8..8093746c646 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -457,19 +457,19 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): pbox.prop(ffmpeg, "max_b_frames", text="") pbox.enabled = ffmpeg.use_max_b_frames - split = layout.split() - split.enabled = ffmpeg.constant_rate_factor == 'NONE' - col = split.column() - col.label(text="Rate:") - col.prop(ffmpeg, "video_bitrate") - col.prop(ffmpeg, "minrate", text="Minimum") - col.prop(ffmpeg, "maxrate", text="Maximum") - col.prop(ffmpeg, "buffersize", text="Buffer") + if ffmpeg.constant_rate_factor == 'NONE': + split = layout.split() + col = split.column() + col.label(text="Rate:") + col.prop(ffmpeg, "video_bitrate") + col.prop(ffmpeg, "minrate", text="Minimum") + col.prop(ffmpeg, "maxrate", text="Maximum") + col.prop(ffmpeg, "buffersize", text="Buffer") - col = split.column() - col.label(text="Mux:") - col.prop(ffmpeg, "muxrate", text="Rate") - col.prop(ffmpeg, "packetsize", text="Packet Size") + col = split.column() + col.label(text="Mux:") + col.prop(ffmpeg, "muxrate", text="Rate") + col.prop(ffmpeg, "packetsize", text="Packet Size") layout.separator() @@ -477,10 +477,10 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): if ffmpeg.format != 'MP3': layout.prop(ffmpeg, "audio_codec", text="Audio Codec") - row = layout.row() - row.enabled = ffmpeg.audio_codec != 'NONE' - row.prop(ffmpeg, "audio_bitrate") - row.prop(ffmpeg, "audio_volume", slider=True) + if ffmpeg.audio_codec != 'NONE': + row = layout.row() + row.prop(ffmpeg, "audio_bitrate") + row.prop(ffmpeg, "audio_volume", slider=True) class RENDER_PT_bake(RenderButtonsPanel, Panel): diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 937fd79291e..8f050fcbd49 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5467,7 +5467,7 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna) }; static const EnumPropertyItem ffmpeg_crf_items[] = { - {FFM_CRF_NONE, "NONE", 0, "None; use constant bit-rate", + {FFM_CRF_NONE, "NONE", 0, "None; use custom bitrate", "Use constant bit rate, rather than constant output quality"}, {FFM_CRF_LOSSLESS, "LOSSLESS", 0, "Lossless", ""}, {FFM_CRF_PERC_LOSSLESS, "PERC_LOSSLESS", 0, "Perceptually lossless", ""}, |