diff options
Diffstat (limited to 'release/scripts/startup/bl_ui')
7 files changed, 70 insertions, 26 deletions
diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py index e859798c085..5f0fd3374d2 100644 --- a/release/scripts/startup/bl_ui/properties_output.py +++ b/release/scripts/startup/bl_ui/properties_output.py @@ -367,11 +367,11 @@ class RENDER_PT_encoding_video(RenderOutputButtonsPanel, Panel): # I-frames layout.prop(ffmpeg, "gopsize") # B-Frames - split = layout.split(factor=0.5) - split.prop(ffmpeg, "use_max_b_frames", text="Max B-frames") - pbox = split.column() - pbox.prop(ffmpeg, "max_b_frames", text="") - pbox.enabled = ffmpeg.use_max_b_frames + row = layout.row(align=True, heading="Max B-frames") + row.prop(ffmpeg, "use_max_b_frames", text="") + sub = row.row(align=True) + sub.active = ffmpeg.use_max_b_frames + sub.prop(ffmpeg, "max_b_frames", text="") if not use_crf or ffmpeg.constant_rate_factor == 'NONE': col = layout.column() diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 5fadb31c83f..1612cce3c51 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -623,7 +623,7 @@ def brush_settings(layout, context, brush, popover=False): layout.prop(brush, "pose_origin_type") layout.prop(brush, "pose_offset") layout.prop(brush, "pose_smooth_iterations") - if brush.pose_deform_type == 'ROTATE_TWIST': + if brush.pose_deform_type == 'ROTATE_TWIST' and brush.pose_origin_type in ('TOPOLOGY','FACE_SETS'): layout.prop(brush, "pose_ik_segments") layout.prop(brush, "use_pose_ik_anchored") layout.separator() diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 2c8ed363738..833cd05dd81 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -1174,7 +1174,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel): if domain.is_cache_baking_data and not domain.has_cache_baked_data: split.enabled = False - split.operator("fluid.pause_bake", text="Baking All - ESC to pause") + split.operator("fluid.pause_bake", text="Baking All - ESC to cancel") elif not domain.has_cache_baked_data and not domain.is_cache_baking_data: split.operator("fluid.bake_all", text="Bake All") else: diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 41c220f7ee4..4f317a97b38 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -244,6 +244,20 @@ class SEQUENCER_MT_preview_zoom(Menu): layout.operator_context = 'INVOKE_DEFAULT' +class SEQUENCER_MT_proxy(Menu): + bl_label = "Proxy" + + def draw(self, context): + layout = self.layout + + st = context.space_data + col = layout.column() + col.operator("sequencer.enable_proxies", text="Setup") + col.operator("sequencer.rebuild_proxy", text="Rebuild") + col.enabled = selected_sequences_len(context) >= 1 + layout.prop(st, "proxy_render_size", text="") + + class SEQUENCER_MT_view(Menu): bl_label = "View" @@ -291,6 +305,10 @@ class SEQUENCER_MT_view(Menu): layout.operator("view2d.zoom_border", text="Zoom") layout.menu("SEQUENCER_MT_preview_zoom") + layout.separator() + + layout.menu("SEQUENCER_MT_proxy") + layout.operator_context = 'INVOKE_DEFAULT' if is_sequencer_view: @@ -376,12 +394,15 @@ class SEQUENCER_MT_select_linked(Menu): layout.operator("sequencer.select_more", text="More") -class SEQUENCER_MT_select_playhead(Menu): - bl_label = "Select Playhead" +class SEQUENCER_MT_select_side_of_frame(Menu): + bl_label = "Side of Current Frame" def draw(self, _context): layout = self.layout + props = layout.operator("sequencer.select", text="Overlap") + props.left_right = 'OVERLAP' + props.linked_time = True props = layout.operator("sequencer.select", text="Left") props.left_right = 'LEFT' props.linked_time = True @@ -408,7 +429,7 @@ class SEQUENCER_MT_select(Menu): layout.separator() - layout.menu("SEQUENCER_MT_select_playhead", text="Playhead") + layout.menu("SEQUENCER_MT_select_side_of_frame") layout.menu("SEQUENCER_MT_select_handle", text="Handle") layout.menu("SEQUENCER_MT_select_channel", text="Channel") layout.menu("SEQUENCER_MT_select_linked", text="Linked") @@ -770,9 +791,6 @@ class SEQUENCER_MT_strip(Menu): layout.separator() layout.menu("SEQUENCER_MT_strip_input") - layout.separator() - layout.operator("sequencer.rebuild_proxy") - class SEQUENCER_MT_context_menu(Menu): bl_label = "Sequencer Context Menu" @@ -1042,7 +1060,8 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): strip_type = strip.type if strip_type == 'COLOR': - layout.prop(strip, "color") + layout.template_color_picker(strip, "color", value_slider=True, cubic=True) + layout.prop(strip, "color", text="") elif strip_type == 'WIPE': col = layout.column() @@ -1133,9 +1152,13 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): elif strip_type == 'TEXT': layout = self.layout - layout.use_property_split = False - layout.prop(strip, "text", text="") - layout.use_property_split = True + col = layout.column() + col.scale_x = 1.3 + col.scale_y = 1.3 + col.use_property_split = False + col.prop(strip, "text", text="") + col.use_property_split = True + layout.prop(strip, "wrap_width", text="Wrap Width") col = layout.column(align=True) if strip_type == 'SPEED': @@ -1172,9 +1195,8 @@ class SEQUENCER_PT_effect_text_layout(SequencerButtonsPanel, Panel): layout.use_property_split = True col = layout.column() col.prop(strip, "location", text="Location") - col.prop(strip, "align_x", text="Alignment X") + col.prop(strip, "align_x", text="Anchor X") col.prop(strip, "align_y", text="Y") - col.prop(strip, "wrap_width", text="Wrap Width") class SEQUENCER_PT_effect_text_style(SequencerButtonsPanel, Panel): @@ -1563,10 +1585,10 @@ class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): split.alignment = 'RIGHT' split.label(text="Playhead") split = split.split(factor=0.8 + max_factor, align=True) - playhead = frame_current - frame_final_start - split.label(text="{:>14}".format(smpte_from_frame(playhead))) + frame_display = frame_current - frame_final_start + split.label(text="{:>14}".format(smpte_from_frame(frame_display))) split.alignment = 'RIGHT' - split.label(text=str(playhead) + " ") + split.label(text=str(frame_display) + " ") if strip.type == 'SCENE': scene = strip.scene @@ -1664,7 +1686,7 @@ class SEQUENCER_PT_adjust_transform(SequencerButtonsPanel, Panel): return strip.type in { 'MOVIE', 'IMAGE', 'SCENE', 'MOVIECLIP', 'MASK', - 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', + 'META', 'ADD', 'SUBTRACT', 'ALPHA_OVER', 'TEXT', 'ALPHA_UNDER', 'CROSS', 'GAMMA_CROSS', 'MULTIPLY', 'OVER_DROP', 'WIPE', 'GLOW', 'TRANSFORM', 'COLOR', 'MULTICAM', 'SPEED', 'ADJUSTMENT', 'COLORMIX' @@ -2198,7 +2220,8 @@ classes = ( SEQUENCER_MT_view_cache, SEQUENCER_MT_view_toggle, SEQUENCER_MT_preview_zoom, - SEQUENCER_MT_select_playhead, + SEQUENCER_MT_proxy, + SEQUENCER_MT_select_side_of_frame, SEQUENCER_MT_select_handle, SEQUENCER_MT_select_channel, SEQUENCER_MT_select_linked, diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 1aa5dde168b..b4c1ea5163f 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1228,6 +1228,25 @@ class _defs_sculpt: draw_settings=draw_settings, ) + @ToolDef.from_fn + def cloth_filter(): + def draw_settings(_context, layout, tool): + props = tool.operator_properties("sculpt.cloth_filter") + layout.prop(props, "type", expand=False) + layout.prop(props, "strength") + layout.prop(props, "cloth_mass") + layout.prop(props, "cloth_damping") + layout.prop(props, "use_face_sets") + + return dict( + idname="builtin.cloth_filter", + label="Cloth Filter", + icon="ops.sculpt.cloth_filter", + widget=None, + keymap=(), + draw_settings=draw_settings, + ) + class _defs_vertex_paint: @@ -2402,6 +2421,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): _defs_sculpt.hide_border, None, _defs_sculpt.mesh_filter, + _defs_sculpt.cloth_filter, None, _defs_transform.translate, _defs_transform.rotate, diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 63fc44aed38..436d866886b 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1284,12 +1284,12 @@ class USERPREF_PT_saveload_autorun(FilePathsPanel, Panel): box = layout.box() row = box.row() row.label(text="Excluded Paths:") - row.operator("wm.userpref_autoexec_path_add", text="", icon='ADD', emboss=False) + row.operator("preferences.autoexec_path_add", text="", icon='ADD', emboss=False) for i, path_cmp in enumerate(prefs.autoexec_paths): row = box.row() row.prop(path_cmp, "path", text="") row.prop(path_cmp, "use_glob", text="", icon='FILTER') - row.operator("wm.userpref_autoexec_path_remove", text="", icon='X', emboss=False).index = i + row.operator("preferences.autoexec_path_remove", text="", icon='X', emboss=False).index = i # ----------------------------------------------------------------------------- diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 6dc21669f32..4795298d2f0 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1224,6 +1224,7 @@ class VIEW3D_MT_view_cameras(Menu): layout.operator("view3d.object_as_camera") layout.operator("view3d.view_camera", text="Active Camera") + layout.operator("view3d.view_center_camera") class VIEW3D_MT_view_viewpoint(Menu): |