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 16:46:57 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-03-22 16:47:22 +0300
commitcfe43f8d1af2183a115414abd56a899d116be27d (patch)
tree5f724ad091d62cb98bda7af5d1a7539bb2591fdb /release
parente35f964daa32ab59a77a56cdc145cbe3be95c4cc (diff)
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.
Diffstat (limited to 'release')
-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 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:")