[Bf-blender-cvs] [cfe43f8d1af] master: Fix T54360: FFMPEG bitrate not editable for all codecs

[Sybren A. Stüvel]

Commit: cfe43f8d1af2183a115414abd56a899d116be27d
Author: Sybren A. Stüvel
Date:   Thu Mar 22 14:46:57 2018 +0100
Branches: master
https://developer.blender.org/rBcfe43f8d1af2183a115414abd56a899d116be27d

Fix T54360: FFMPEG bitrate not editable for all codecs

The bitrate selection was hidden when a CRF mode was chosen and then
switched to a codec that doesn't support CRF.

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

M	release/scripts/startup/bl_ui/properties_render.py

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

diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 8093746c646..41ebf8196d2 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -443,7 +443,8 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
             layout.prop(ffmpeg, "use_lossless_output")
 
         # Output quality
-        if needs_codec and ffmpeg.codec in {'H264', 'MPEG4'}:
+        use_crf = needs_codec and ffmpeg.codec in {'H264', 'MPEG4'}
+        if use_crf:
             layout.prop(ffmpeg, "constant_rate_factor")
 
         # Encoding speed
@@ -457,7 +458,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
         pbox.prop(ffmpeg, "max_b_frames", text="")
         pbox.enabled = ffmpeg.use_max_b_frames
 
-        if ffmpeg.constant_rate_factor == 'NONE':
+        if not use_crf or ffmpeg.constant_rate_factor == 'NONE':
             split = layout.split()
             col = split.column()
             col.label(text="Rate:")