Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-03-22 17:10:42 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-03-22 17:10:42 +0300
commitf4dc9f9d68bddaa206b692e1d077d1a1f2bb1528 (patch)
treeb1c888905afed92f7677f7feb8832bbecf6e8db9
parent6f07673ce457740558906f156691db84d4c89999 (diff)
Fix T54360: FFMPEG bitrate not editable for all codecsv2.79b
The bitrate selection was hidden when a CRF mode was chosen and then switched to a codec that doesn't support CRF.
-rw-r--r--release/scripts/startup/bl_ui/properties_render.py5
1 files changed, 3 insertions, 2 deletions
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")