[Bf-blender-cvs] [f4dc9f9d68b] blender-v2.79b-release: Fix T54360: FFMPEG bitrate not editable for all codecs

[Sybren A. Stüvel]

Commit: f4dc9f9d68bddaa206b692e1d077d1a1f2bb1528
Author: Sybren A. Stüvel
Date:   Thu Mar 22 15:10:42 2018 +0100
Branches: blender-v2.79b-release
https://developer.blender.org/rBf4dc9f9d68bddaa206b692e1d077d1a1f2bb1528

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 a7e8d9273ad..6aa3ae37f12 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -473,7 +473,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
@@ -488,7 +489,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
         pbox.enabled = ffmpeg.use_max_b_frames
 
         split = layout.split()
-        split.enabled = ffmpeg.constant_rate_factor == 'NONE'
+        split.enabled = not use_crf or ffmpeg.constant_rate_factor == 'NONE'
         col = split.column()
         col.label(text="Rate:")
         col.prop(ffmpeg, "video_bitrate")