Merge branch 'master' into blender2.8

2018-04-09 15:44:28 +02:00
parent d533b70b23 7e39d151d8
commit c1a2f973da
7 changed files with 71 additions and 35 deletions
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -490,7 +490,7 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
            layout.prop(ffmpeg, "use_lossless_output")

        # Output quality
-        use_crf = needs_codec and ffmpeg.codec in {'H264', 'MPEG4'}
+        use_crf = needs_codec and ffmpeg.codec in {'H264', 'MPEG4', 'WEBM'}
        if use_crf:
            layout.prop(ffmpeg, "constant_rate_factor")