diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 3d72a2a588c..25dc4663500 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -187,6 +187,7 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel): bl_context = ".mesh_edit" # dot on purpose (access from topbar) bl_label = "Options" bl_options = {'DEFAULT_CLOSED'} + bl_ui_units_x = 12 @classmethod def poll(cls, context): @@ -198,11 +199,19 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel): layout.use_property_split = True layout.use_property_decorate = False + tool_settings = context.tool_settings ob = context.active_object mesh = ob.data split = layout.split() + row = layout.row(align=True, heading="Transform") + row.prop(tool_settings, "use_transform_correct_face_attributes") + + row = layout.row(align=True) + row.active = tool_settings.use_transform_correct_face_attributes + row.prop(tool_settings, "use_transform_correct_keep_connected") + row = layout.row(heading="Mirror") sub = row.row(align=True) sub.prop(mesh, "use_mirror_x", text="X", toggle=True) @@ -732,7 +741,8 @@ class VIEW3D_PT_sculpt_dyntopo(Panel, View3DPaintPanel): @classmethod def poll(cls, context): - return (context.sculpt_object and context.tool_settings.sculpt) + paint_settings = cls.paint_settings(context) + return (context.sculpt_object and context.tool_settings.sculpt and paint_settings) def draw_header(self, context): is_popover = self.is_popover @@ -806,6 +816,9 @@ class VIEW3D_PT_sculpt_voxel_remesh(Panel, View3DPaintPanel): col.prop(mesh, "use_remesh_preserve_volume", text="Volume") col.prop(mesh, "use_remesh_preserve_paint_mask", text="Paint Mask") col.prop(mesh, "use_remesh_preserve_sculpt_face_sets", text="Face Sets") + if context.preferences.experimental.use_sculpt_vertex_colors: + col.prop(mesh, "use_remesh_preserve_vertex_colors", text="Vertex Colors") + layout.operator("object.voxel_remesh", text="Remesh") @@ -829,7 +842,6 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel): sculpt = tool_settings.sculpt col = layout.column(heading="Display", align=True) - col.prop(sculpt, "use_threaded", text="Threaded Sculpt") col.prop(sculpt, "show_low_resolution") col.prop(sculpt, "use_sculpt_delay_updates") col.prop(sculpt, "use_deform_only") @@ -1381,6 +1393,9 @@ class VIEW3D_PT_tools_grease_pencil_brush_advanced(View3DPanel, Panel): col = layout.column(align=True) if brush is not None: + col.prop(gp_settings, "brush_draw_mode") + col.separator() + if brush.gpencil_tool != 'FILL': col.prop(gp_settings, "input_samples") col.separator() @@ -1694,7 +1709,7 @@ class GreasePencilSculptPanel: @classmethod def poll(cls, context): - if context.space_data.type in ('VIEW_3D', 'PROPERTIES'): + if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}: if context.gpencil_data is None: return False @@ -1768,7 +1783,7 @@ class GreasePencilWeightPanel: @classmethod def poll(cls, context): - if context.space_data.type in ('VIEW_3D', 'PROPERTIES'): + if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}: if context.gpencil_data is None: return False @@ -1843,7 +1858,7 @@ class GreasePencilVertexPanel: @classmethod def poll(cls, context): - if context.space_data.type in ('VIEW_3D', 'PROPERTIES'): + if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}: if context.gpencil_data is None: return False |