diff options
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/bmesh/find_adjacent.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 31 |
2 files changed, 28 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_operators/bmesh/find_adjacent.py b/release/scripts/startup/bl_operators/bmesh/find_adjacent.py index 686392823f1..1555f465aa5 100644 --- a/release/scripts/startup/bl_operators/bmesh/find_adjacent.py +++ b/release/scripts/startup/bl_operators/bmesh/find_adjacent.py @@ -203,6 +203,7 @@ def find_next(ele_dst, ele_src): candidates = elems_depth_search(ele_dst, depth_src_a, other_edges_over_edge) candidates = elems_depth_search(ele_dst, depth_src_b, other_edges_over_face, candidates) candidates.discard(ele_src) + candidates.discard(ele_dst) if not candidates: return [] @@ -217,6 +218,8 @@ def find_next(ele_dst, ele_src): for ele_test in candidates: depth_test_a = elems_depth_measure(ele_dst, ele_test, other_edges_over_edge) depth_test_b = elems_depth_measure(ele_dst, ele_test, other_edges_over_face) + if depth_test_a is None or depth_test_b is None: + continue depth_test = tuple(zip(depth_test_a, depth_test_b)) # square so a few high values win over many small ones diff_test = sum((abs(a[0] - b[0]) ** 2) + @@ -237,9 +240,12 @@ def find_next(ele_dst, ele_src): ele_best_ls = [] depth_accum_max = -1 for ele_test in ele_best_ls_init: + depth_test_a = elems_depth_measure(ele_src, ele_test, other_edges_over_edge) + depth_test_b = elems_depth_measure(ele_src, ele_test, other_edges_over_face) + if depth_test_a is None or depth_test_b is None: + continue depth_accum_test = ( - sum(elems_depth_measure(ele_src, ele_test, other_edges_over_edge)) + - sum(elems_depth_measure(ele_src, ele_test, other_edges_over_face))) + sum(depth_test_a) + sum(depth_test_b)) if depth_accum_test > depth_accum_max: depth_accum_max = depth_accum_test diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index b644b6f0a86..26fb05363ff 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -460,12 +460,32 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): split.prop(rd.ffmpeg, "format") split.prop(ffmpeg, "use_autosplit") + # Video: layout.separator() + self.draw_vcodec(context) + + # Audio: + layout.separator() + if ffmpeg.format != 'MP3': + layout.prop(ffmpeg, "audio_codec", text="Audio Codec") + + if ffmpeg.audio_codec != 'NONE': + row = layout.row() + row.prop(ffmpeg, "audio_bitrate") + row.prop(ffmpeg, "audio_volume", slider=True) + + def draw_vcodec(self, context): + """Video codec options.""" + layout = self.layout + ffmpeg = context.scene.render.ffmpeg needs_codec = ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG', 'MPEG4'} if needs_codec: layout.prop(ffmpeg, "codec") + if needs_codec and ffmpeg.codec == 'NONE': + return + if ffmpeg.codec in {'DNXHD'}: layout.prop(ffmpeg, "use_lossless_output") @@ -499,17 +519,6 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): col.prop(ffmpeg, "muxrate", text="Rate") col.prop(ffmpeg, "packetsize", text="Packet Size") - layout.separator() - - # Audio: - if ffmpeg.format != 'MP3': - layout.prop(ffmpeg, "audio_codec", text="Audio Codec") - - if ffmpeg.audio_codec != 'NONE': - row = layout.row() - row.prop(ffmpeg, "audio_bitrate") - row.prop(ffmpeg, "audio_volume", slider=True) - class RENDER_PT_bake(RenderButtonsPanel, Panel): bl_label = "Bake" |