Fix T53276: encoding output quality UI clarification.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 23 Nov 2017 16:55:25 +0000 (17:55 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 23 Nov 2017 16:55:25 +0000 (17:55 +0100)
release/scripts/startup/bl_ui/properties_render.py
source/blender/makesrna/intern/rna_scene.c

index 2f3adf546b8fcf92ab47efd76a586e65980f8771..8093746c646ed79c4bfc749340e8c97869f4105c 100644 (file)
@@ -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):
index 937fd79291e97edafa02b03d74ec2febab0a50f2..8f050fcbd496918b9ec1b90da3eea8ef0813d1da 100644 (file)
@@ -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", ""},