diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-22 18:41:37 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-22 18:41:37 +0300 |
| commit | 18e2a5df1a1d0a279c39f09f00f2c3275748ce60 (patch) | |
| tree | e181c410467c23e0102dd3fb45ccb410f9cec48c /release | |
| parent | 47acd706fde992e1b4f940145724aae9bf896861 (diff) | |
| parent | 69b327d8dcf91cccedf08b9a50c92d5b3922449b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index f13c1fb3130..e67b275a3ee 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -302,7 +302,7 @@ class CLIP_OT_bundles_to_mesh(Operator): matrix = camera.matrix_world * reconstructed_matrix.inverted() for track in tracking_object.tracks: - if track.has_bundle and track.select == True: + if track.has_bundle and track.select: new_verts.append(track.bundle) if new_verts: diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 12b0df795c7..ed926b51a9c 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -469,7 +469,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 @@ -483,7 +484,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:") |