manual/sculpt_paint/brush/brush_settings.rst

@@ -161,7 +161,7 @@ Deformation Target
 
    :Geometry: Deform the geometry directly.
    :Cloth Simulation:
-      Deform the mesh while a :doc:`cloth simulation </sculpt_paint/sculpting/tools/cloth>`
+      Deform the mesh while a :doc:`cloth simulation </sculpt_paint/sculpting/brushes/cloth>`
       is applied to it at the same time.
 
 

manual/sculpt_paint/brush/texture.rst

@@ -146,5 +146,5 @@ Vector Displacement :guilabel:`Sculpt Mode`
 
    .. note::
 
-      This is only supported for the :doc:`Draw </sculpt_paint/sculpting/tools/draw>` brush
+      This is only supported for the :doc:`Draw </sculpt_paint/sculpting/brushes/draw>` brush
       with :ref:`Area Plane <bpy.types.BrushTextureSlot.map_mode>` mapping enabled.

manual/sculpt_paint/sculpting/brushes/blob.rst

@@ -6,9 +6,9 @@ Blob
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Blob`
+   :Brush:     :menuselection:`Asset Shelf --> Blob`
 
-Similar to :doc:`Draw </sculpt_paint/sculpting/tools/clay>`,
+Similar to :doc:`Draw </sculpt_paint/sculpting/brushes/clay>`,
 but vertices are pushed outwards like an inverted pinching effect.
 This will lead to a more consistent spherical curvature and thickening of strokes.
 

manual/sculpt_paint/sculpting/brushes/boundary.rst

@@ -6,9 +6,9 @@ Boundary
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Boundary`
+   :Brush:     :menuselection:`Asset Shelf --> Boundary`
 
-Similar to the :doc:`Pose </sculpt_paint/sculpting/tools/pose>` brush
+Similar to the :doc:`Pose </sculpt_paint/sculpting/brushes/pose>` brush
 but deforms the open boundaries of a mesh.
 The tool detects the mesh boundary closest to the active vertex and
 propagates the deformation using the brush :doc:`Falloff </sculpt_paint/brush/falloff>` into the mesh.
@@ -61,16 +61,16 @@ Deformation
       Moves/extends the mesh boundary in the local X direction.
       Useful for extending the boundaries along the surface.
    :Inflate:
-      Works similar to the :doc:`Inflate </sculpt_paint/sculpting/tools/inflate>` tool but,
+      Works similar to the :doc:`Inflate </sculpt_paint/sculpting/brushes/inflate>` tool but,
       the vertices that are inflated are constrained to the mesh boundary.
    :Grab:
-      Works similar to the :doc:`Grab </sculpt_paint/sculpting/tools/grab>` tool but,
+      Works similar to the :doc:`Grab </sculpt_paint/sculpting/brushes/grab>` tool but,
       the vertices that are grabbed are constrained to the mesh boundary.
    :Twist:
       Rotates the active boundary around the local Z axis.
       Useful for creating folds like on a skirt.
    :Smooth:
-      Works similar to the :doc:`Grab </sculpt_paint/sculpting/tools/smooth>` tool but,
+      Works similar to the :doc:`Grab </sculpt_paint/sculpting/brushes/smooth>` tool but,
       the vertices that are smoothed are constrained to the mesh boundary.
 
 .. _bpy.types.Brush.boundary_falloff_type:

manual/sculpt_paint/sculpting/brushes/clay.rst

@@ -6,12 +6,12 @@ Clay
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Clay`
+   :Brush:     :menuselection:`Asset Shelf --> Clay`
 
-Similar to the :doc:`Draw </sculpt_paint/sculpting/tools/draw>` brush,
+Similar to the :doc:`Draw </sculpt_paint/sculpting/brushes/draw>` brush,
 but includes settings to adjust the :ref:`sculpt plane <bpy.types.Brush.sculpt_plane>`
 on which the brush acts. That's because it behaves like a combination of the
-:doc:`Flatten </sculpt_paint/sculpting/tools/flatten>` and *Draw* brushes.
+:doc:`Flatten </sculpt_paint/sculpting/brushes/flatten>` and *Draw* brushes.
 
 This brush is useful for building and removing volumes and shapes like real clay,
 because it flattens details as you add/subtract from the surfaces.

manual/sculpt_paint/sculpting/brushes/clay_strips.rst

@@ -6,10 +6,10 @@ Clay Strips
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Clay Strips`
+   :Brush:     :menuselection:`Asset Shelf --> Clay Strips`
    :Shortcut:  :kbd:`C`
 
-Similar to the :doc:`Clay </sculpt_paint/sculpting/tools/clay>` brush,
+Similar to the :doc:`Clay </sculpt_paint/sculpting/brushes/clay>` brush,
 but it uses a square tip shape instead of a round one.
 
 Just like the *Clay* brush, it's useful for building and removing volumes

manual/sculpt_paint/sculpting/brushes/clay_thumb.rst

@@ -6,9 +6,9 @@ Clay Thumb
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Clay Thumb`
+   :Brush:     :menuselection:`Asset Shelf --> Clay Thumb`
 
-Similar to the :doc:`/sculpt_paint/sculpting/tools/clay` brush.
+Similar to the :doc:`/sculpt_paint/sculpting/brushes/clay` brush.
 It imitates the effect of deforming clay with the finger, accumulating material during the stroke.
 The sculpt plane tilts during the stroke in the front part of the brush to achieve this effect.
 

manual/sculpt_paint/sculpting/brushes/cloth.rst

@@ -7,7 +7,7 @@ Cloth
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Cloth`
+   :Brush:     :menuselection:`Asset Shelf --> Cloth`
 
 This brush simulates cloth physics on the mesh under the brush cursor.
 There are various deformation types and settings to customize the brush.

manual/sculpt_paint/sculpting/brushes/crease.rst

@@ -6,7 +6,7 @@ Crease
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Crease`
+   :Brush:     :menuselection:`Asset Shelf --> Crease`
    :Shortcut:  :kbd:`Shift-C`
 
 Create sharp indents or ridges by pushing or pulling the mesh, while pinching the vertices together.
@@ -24,9 +24,9 @@ General
 Pinch
    Adds a consistent pinching effect to your stroke.
    If set to 0 it the brush will behave like the
-   :doc:`Draw </sculpt_paint/sculpting/tools/draw>` brush.
+   :doc:`Draw </sculpt_paint/sculpting/brushes/draw>` brush.
    If set to 1 and the brush strength set to 0, the brush
-   will behave like a :doc:`Pinch </sculpt_paint/sculpting/tools/pinch>` brush.
+   will behave like a :doc:`Pinch </sculpt_paint/sculpting/brushes/pinch>` brush.
 
 .. note::
 

manual/sculpt_paint/sculpting/brushes/density.rst

@@ -1,20 +1,20 @@
 
-********
-Simplify
-********
+*******
+Density
+*******
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Simplify`
+   :Brush:     :menuselection:`Asset Shelf --> Density`
 
-The Simplify brush is specifically meant for use with
+The Density brush is specifically meant for use with
 :doc:`/sculpt_paint/sculpting/tool_settings/dyntopo`
 to remove/add detail in the mesh.
 
 Even when the :ref:`Refine Method <bpy.types.Sculpt.detail_refine_method>`
 is set to *Subdivide Edges*, this brush is always able to collapse edges.
-This ensures that while focusing on adding detail to your sculpt, the *Simplify* brush
+This ensures that while focusing on adding detail to your sculpt, the *Density* brush
 can always be used to simplify and polish surfaces.
 
 This brush has no effect if Dyntopo is disabled.

manual/sculpt_paint/sculpting/brushes/draw.rst

@@ -5,7 +5,7 @@ Draw
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Draw`
+   :Brush:     :menuselection:`Asset Shelf --> Draw`
    :Shortcut:  :kbd:`V`
 
 Moves vertices inward or outward, based the average vertex normals within the brush radius.

manual/sculpt_paint/sculpting/brushes/draw_facesets.rst

@@ -6,7 +6,7 @@ Draw Face Sets
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Draw Face Sets`
+   :Brush:     :menuselection:`Asset Shelf --> Draw Face Sets`
 
 Draw new or extend existing :ref:`Face Sets <sculpting-editing-facesets>` with each stroke.
 

manual/sculpt_paint/sculpting/brushes/draw_sharp.rst

@@ -6,21 +6,21 @@ Draw Sharp
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Draw Sharp`
+   :Brush:     :menuselection:`Asset Shelf --> Draw Sharp`
 
-Similar to the :doc:`Draw </sculpt_paint/sculpting/tools/draw>` brush,
+Similar to the :doc:`Draw </sculpt_paint/sculpting/brushes/draw>` brush,
 but it always deforms the mesh from the original coordinates
 and uses the *Sharper* Falloff by default.
 
 Draw Sharp is useful on high density meshes for creating cloth wrinkles, stylized hair or hard surface edges.
 To further sharpen or polish sharp edges in the case that the mesh density is not enough,
-it's recommended to use the :doc:`Pinch </sculpt_paint/sculpting/tools/pinch>`,
-:doc:`Crease </sculpt_paint/sculpting/tools/crease>` or
-:doc:`Multiplane Scrape </sculpt_paint/sculpting/tools/multiplane_scrape>` brushes.
+it's recommended to use the :doc:`Pinch </sculpt_paint/sculpting/brushes/pinch>`,
+:doc:`Crease </sculpt_paint/sculpting/brushes/crease>` or
+:doc:`Multiplane Scrape </sculpt_paint/sculpting/brushes/multiplane_scrape>` brushes.
 
 A limitation is that the brush does not remesh the sculpted surfaces
 with :ref:`Dyntopo <bpy.ops.sculpt.dynamic_topology_toggle>` enabled.
-Because of that, a better brush to use with Dyntopo can be :doc:`Crease </sculpt_paint/sculpting/tools/crease>`.
+Because of that, a better brush to use with Dyntopo can be :doc:`Crease </sculpt_paint/sculpting/brushes/crease>`.
 
 
 Brush Settings

manual/sculpt_paint/sculpting/brushes/elastic_deform.rst

@@ -6,7 +6,7 @@ Elastic Deform
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Elastic Deform`
+   :Brush:     :menuselection:`Asset Shelf --> Elastic Deform`
 
 Used to simulate realistic deformations such as grabbing or twisting of :term:`Elastic` objects.
 For example, this tool works great for modeling the shape of organic objects such as humans or animals.

manual/sculpt_paint/sculpting/brushes/fill.rst

@@ -6,9 +6,9 @@ Fill
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Fill`
+   :Brush:     :menuselection:`Asset Shelf --> Fill`
 
-Similar to the :doc:`Flatten </sculpt_paint/sculpting/tools/flatten>` brush,
+Similar to the :doc:`Flatten </sculpt_paint/sculpting/brushes/flatten>` brush,
 but only pushes surfaces upwards to the medium height.
 
 Although :kbd:`Ctrl` can be held to invert the effect to a Scrape brush,

manual/sculpt_paint/sculpting/brushes/flatten.rst

@@ -1,12 +1,12 @@
 
-*******
-Flatten
-*******
+****************
+Flatten/Contrast
+****************
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Flatten`
+   :Brush:     :menuselection:`Asset Shelf --> Flatten/Contrast`
 
 Flatten or contrast surfaces by pulling and pushing them towards
 (or away from) a defined medium height.

manual/sculpt_paint/sculpting/brushes/grab.rst

@@ -6,7 +6,7 @@ Grab
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Grab`
+   :Brush:     :menuselection:`Asset Shelf --> Grab`
    :Shortcut:  :kbd:`G`
 
 Drag geometry across the screen, following the cursor.

manual/sculpt_paint/sculpting/brushes/index.rst

@@ -8,6 +8,7 @@ Brushes for *Sculpt Mode* bundled in the *Essentials* library.
 .. toctree::
    :maxdepth: 1
 
+   overview.rst
    draw.rst
    draw_sharp.rst
    clay.rst
@@ -29,11 +30,11 @@ Brushes for *Sculpt Mode* bundled in the *Essentials* library.
    thumb.rst
    pose.rst
    nudge.rst
-   rotate.rst
+   twist.rst
    slide_relax.rst
    boundary.rst
    cloth.rst
-   simplify.rst
+   density.rst
    mask.rst
    draw_facesets.rst
    multires_displacement_eraser.rst

manual/sculpt_paint/sculpting/brushes/inflate.rst

@@ -1,15 +1,15 @@
 
-*******
-Inflate
-*******
+***************
+Inflate/Deflate
+***************
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Inflate`
+   :Brush:     :menuselection:`Asset Shelf --> Inflate/Deflate`
    :Shortcut:  :kbd:`I`
 
-Similar to :doc:`Draw </sculpt_paint/sculpting/tools/clay>`,
+Similar to :doc:`Draw </sculpt_paint/sculpting/brushes/clay>`,
 except that vertices are moved in the direction of their own normals.
 Especially useful when sculpting meshes with a lot of curvature.
 

manual/sculpt_paint/sculpting/brushes/layer.rst

@@ -6,9 +6,9 @@ Layer
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Layer`
+   :Brush:     :menuselection:`Asset Shelf --> Layer`
 
-This brush is similar to :doc:`Draw </sculpt_paint/sculpting/tools/clay>`,
+This brush is similar to :doc:`Draw </sculpt_paint/sculpting/brushes/clay>`,
 except that the height capped.
 This creates the appearance of a flat layer.
 

manual/sculpt_paint/sculpting/brushes/multiplane_scrape.rst

@@ -1,12 +1,12 @@
 
 *****************
-Multiplane Scrape
+Scrape Multiplane
 *****************
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Multiplane Scrape`
+   :Brush:     :menuselection:`Brush --> Scrape Multiplane`
 
 Scrapes the mesh with two angled planes at the same time, creating a sharp edge between them.
 This is useful for creating & polishing hard surface objects.

manual/sculpt_paint/sculpting/brushes/multires_displacement_eraser.rst

@@ -1,12 +1,12 @@
 
-****************************
-Multires Displacement Eraser
-****************************
+***************************
+Erase Multires Displacement
+***************************
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Multires Displacement Erase`
+   :Brush:     :menuselection:`Asset Shelf --> Erase Multires Displacement`
 
 This brush deletes displacement information of
 the :doc:`Multires Modifier </modeling/modifiers/generate/multiresolution>`,

manual/sculpt_paint/sculpting/brushes/multires_displacement_smear.rst

@@ -1,12 +1,12 @@
 
 ***************************
-Multires Displacement Smear
+Smear Multires Displacement
 ***************************
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Multires Displacement Smear`
+   :Brush:     :menuselection:`Asset Shelf --> Smear Multires Displacement`
 
 This tool deforms displacement information of
 the :doc:`Multires Modifier </modeling/modifiers/generate/multiresolution>`,

manual/sculpt_paint/sculpting/brushes/nudge.rst

@@ -6,11 +6,11 @@ Nudge
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Nudge`
+   :Brush:     :menuselection:`Asset Shelf --> Nudge`
 
 Moves vertices in the direction of the brush stroke.
 
-Similar to the :doc:`Snake Hook </sculpt_paint/sculpting/tools/snake_hook>` brush,
+Similar to the :doc:`Snake Hook </sculpt_paint/sculpting/brushes/snake_hook>` brush,
 but instead only moves the geometry along the surface (using the area plane).
 This is useful for grabbing geometry along curved surfaces,
 without making too impactful changes to the overall object shape.

manual/sculpt_paint/sculpting/brushes/overview.rst

@@ -0,0 +1,161 @@
+
+********
+Overview
+********
+
+There are a number of brushes for sculpt mode bundled in the *Essentials* asset library.
+This is an overview of all of them, categorized by their general functions.
+
+Add/Subtract Brushes
+====================
+
+.. figure:: /images/sculpt-paint_sculpting_brushes_overview-add-substract.png
+   :align: right
+   :width: 250
+
+These brushes generally push vertices outwards and inwards.
+
+:doc:`draw`
+   The standard brush for pushing vertices inwards and outwards from the surface direction.
+
+:doc:`draw_sharp`
+   Same as *Draw* but with a much sharper :doc:`Falloff </sculpt_paint/brush/falloff>`.
+   Useful for creating creases and sharp angles.
+
+:doc:`clay`
+   Similar to the *Draw* brush but with a flattening effect and subtle smoothing.
+   Useful for polishing and building volumes.
+
+:doc:`clay_strips`
+   The same as the *Clay* brush, but more aggressive with a square falloff.
+   A common standard for building rough volumes.
+
+:doc:`layer`
+   Draw with a fixed height. Useful for adding flat layers to a surface.
+
+:doc:`inflate`
+   Moves the mesh in multiple direction. Useful for inflating or shrinking surfaces and volumes.
+
+:doc:`blob`
+   Magnifies the mesh as you draw. Useful for an additional inflation effect on the stroke.
+
+:doc:`crease`
+   Same as *Blob* but with a pinching effect. Useful for creating and polishing sharp creases.
+
+
+Contrast Brushes
+================
+
+.. figure:: /images/sculpt-paint_sculpting_brushes_overview-contrast.png
+   :align: right
+   :width: 250
+
+Recognizable by their red icon and cursor.
+These brushes generally flatten or heighten the contrast of the surface.
+
+:doc:`smooth`
+   Smooths out irregularities in the surface and shrinks volumes by averaging the vertices positions.
+   An essential brush that is frequently used.
+
+:doc:`flatten`
+   Pushes vertices to an average height to create a flat plateau.
+
+:doc:`fill`
+   Pushes surfaces outwards. Useful for filling in holes and crevices.
+
+:doc:`scrape`
+   Pushes surfaces inwards. This is the most common brush for flattening meshes.
+
+:doc:`multiplane_scrape`
+   Scrapes the mesh with two angled planes at the same time, producing a sharp edge between them.
+
+
+Transform Brushes
+=================
+
+.. figure:: /images/sculpt-paint_sculpting_brushes_overview-transform.png
+   :align: right
+   :width: 250
+
+Recognizable by their yellow icon and cursor.
+These brushes generally move, pinch and magnify the mesh.
+
+:doc:`pinch`
+   Pulls vertices towards the center of the brush. Useful for polishing angles and creases.
+
+:doc:`grab`
+   Moves vertices along with the mouse. An essential brush for building shapes and adjusting proportions.
+
+:doc:`elastic_deform`
+   Used to simulate realistic deformations such as grabbing or twisting of :term:`Elastic` objects.
+
+:doc:`snake_hook`
+   Pulls vertices along with the stroke to create long, snake-like forms.
+
+:doc:`thumb`
+   Same as *Grab* but moves vertices along the surface direction. Useful for preserving specific surfaces.
+
+:doc:`pose`
+   Simulating an armature-like deformations. Useful for quick posing and transformations.
+
+:doc:`nudge`
+   Similar as *Thumb* but dynamically picks up vertices like the *Snake Hook*.
+   Useful for nudging something along the mesh surface.
+
+:doc:`twist`
+   Rotates vertices within the brush in the direction mouse.
+
+:doc:`slide_relax`
+   Slides the topology of the mesh in the direction of the stroke
+   while preserving the geometrical shape of the mesh.
+   Also useful for redistributing topology where it is needed.
+
+:doc:`boundary`
+   Transform mesh boundaries specifically with various deformations.
+
+
+Utility Brushes
+===============
+
+.. figure:: /images/sculpt-paint_sculpting_brushes_overview-utilities.png
+   :align: right
+   :width: 250
+
+No clear color assignment.
+These brushes are general purpose brushes or specific.
+
+:doc:`cloth`
+   Simulates cloth to create folds and draping, which can be sculpted further.
+
+:doc:`density`
+   Cleans up geometry by collapsing short edges.
+
+:doc:`mask`
+   Paints a selection on parts of the mesh to be unaffected by other brushes.
+
+:doc:`draw_facesets`
+   Paint new or extend existing face sets.
+
+:doc:`multires_displacement_eraser`
+   Remove displacement information on a Multiresolution modifier.
+
+:doc:`multires_displacement_smear`
+   Smear displacement information on a Multiresolution modifier.
+
+
+Painting Brushes
+================
+
+.. figure:: /images/sculpt-paint_sculpting_brushes_overview-paint.png
+   :align: right
+   :width: 250
+
+Recognizable by their green icon.
+These brushes are used for painting color attributes within sculpt mode.
+
+:doc:`paint`
+   Paint on the vertices of your mesh via color attributes.
+
+:doc:`smear`
+   Smears the vertex colors via color attributes.
+

manual/sculpt_paint/sculpting/brushes/paint.rst

@@ -6,7 +6,7 @@ Paint
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Paint`
+   :Brush:     :menuselection:`Asset Shelf --> Paint`
 
 Paints on the active color attribute.
 Hold :kbd:`Shift` to blur painted colors instead.

manual/sculpt_paint/sculpting/brushes/pinch.rst

@@ -1,12 +1,12 @@
 
-*****
-Pinch
-*****
+*************
+Pinch/Magnify
+*************
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Pinch`
+   :Brush:     :menuselection:`Asset Shelf --> Pinch/Magnify`
    :Shortcut:  :kbd:`P`
 
 Pulls geometry towards the center of the brush.

manual/sculpt_paint/sculpting/brushes/pose.rst

@@ -6,7 +6,7 @@ Pose
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Pose`
+   :Brush:     :menuselection:`Asset Shelf --> Pose`
 
 Deform a model simulating armature-like workflow.
 This can either be useful for posing a model without a rig,

manual/sculpt_paint/sculpting/brushes/scrape.rst

@@ -1,15 +1,15 @@
 
-******
-Scrape
-******
+***********
+Scrape/Fill
+***********
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Scrape`
+   :Brush:     :menuselection:`Asset Shelf --> Scrape/Fill`
    :Shortcut:  :kbd:`Shift-T`
 
-Similar to the :doc:`Flatten </sculpt_paint/sculpting/tools/flatten>` brush,
+Similar to the :doc:`Flatten </sculpt_paint/sculpting/brushes/flatten>` brush,
 but only pushes surfaces downward to the medium height.
 
 Although :kbd:`Ctrl` can be held to invert the effect to a Fill brush,

manual/sculpt_paint/sculpting/brushes/slide_relax.rst

@@ -1,12 +1,12 @@
 
 ***********
-Slide Relax
+Relax Slide
 ***********
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Slide Relax`
+   :Brush:     :menuselection:`Asset Shelf --> Relax Slide`
 
 This brush deforms the topology of the mesh
 while minimizing changes to the geometrical shape of the mesh.

manual/sculpt_paint/sculpting/brushes/smear.rst

@@ -6,7 +6,7 @@ Smear
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Smear`
+   :Brush:     :menuselection:`Asset Shelf --> Smear`
 
 Smears the painted colors of the active color attribute.
 It takes the colors under the cursor, and blends them in the direction of your stroke.

manual/sculpt_paint/sculpting/brushes/smooth.rst

@@ -6,7 +6,7 @@ Smooth
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Smooth`
+   :Brush:     :menuselection:`Asset Shelf --> Smooth`
    :Shortcut:  :kbd:`S`
 
 Smooths the positions of the vertices to either polish surfaces or remove volume from larger shapes.

manual/sculpt_paint/sculpting/brushes/snake_hook.rst

@@ -6,7 +6,7 @@ Snake Hook
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Snake Hook`
+   :Brush:     :menuselection:`Asset Shelf --> Snake Hook`
    :Shortcut:  :kbd:`K`
 
 Pulls vertices along with the movement of the brush to create long, snake-like forms.
@@ -50,4 +50,4 @@ Deformation
       Applies the brush falloff to the tip of the brush.
    :Elastic:
       Modifies the entire mesh using an :term:`Elastic` deformation.
-      More info in the :doc:`Elastic Deform </sculpt_paint/sculpting/tools/elastic_deform>` brush.
+      More info in the :doc:`Elastic Deform </sculpt_paint/sculpting/brushes/elastic_deform>` brush.

manual/sculpt_paint/sculpting/brushes/thumb.rst

@@ -6,9 +6,9 @@ Thumb
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Thumb`
+   :Brush:     :menuselection:`Asset Shelf --> Thumb`
 
-Similar to the :doc:`Grab </sculpt_paint/sculpting/tools/grab>` brush,
+Similar to the :doc:`Grab </sculpt_paint/sculpting/brushes/grab>` brush,
 but instead only moves the geometry along the surface (using the area plane).
 This is useful for grabbing surfaces with a very specific direction,
 or without making too impactful changes to the overall object shape.

manual/sculpt_paint/sculpting/brushes/twist.rst

@@ -1,12 +1,12 @@
 
-******
-Rotate
-******
+*****
+Twist
+*****
 
 .. reference::
 
    :Mode:      Sculpt Mode
-   :Tool:      :menuselection:`Toolbar --> Rotate`
+   :Brush:     :menuselection:`Asset Shelf --> Twist`
 
 Rotates geometry in the direction in which the cursor is moved.
 The initial drag direction is the zero angle

manual/sculpt_paint/sculpting/controls.rst

@@ -32,8 +32,8 @@ Topology
    Only vertices that are topologically connected to where you started
    the stroke/tool on are affected. So loose geometry islands will be auto-masked.
 
-   Additionally for the :doc:`Grab </sculpt_paint/sculpting/tools/grab>` and
-   :doc:`Thumb </sculpt_paint/sculpting/tools/thumb>` brushes, anything that
+   Additionally for the :doc:`Grab </sculpt_paint/sculpting/brushes/grab>` and
+   :doc:`Thumb </sculpt_paint/sculpting/brushes/thumb>` brushes, anything that
    is not connected within the brush radius will be auto-masked.
    So even if geometry is connected somewhere,
    it is considered separate if the connection is not within the radius.

manual/sculpt_paint/sculpting/editing/expand.rst

@@ -227,7 +227,7 @@ Saving Masks
    :doc:`hide face sets </sculpt_paint/sculpting/editing/sculpt>`)
 
 Pivot Points for Pose Brush
-   When using the :doc:`Pose Brush </sculpt_paint/sculpting/tools/pose>` it is most predictable when using it with
+   When using the :doc:`Pose Brush </sculpt_paint/sculpting/brushes/pose>` it is most predictable when using it with
    Face Sets to define the face set boundaries as pivot point locations.
    Face Sets can be expanded from a point or from a boundary between hidden face sets
    to create them quickly.
@@ -239,7 +239,7 @@ Pivot Points for Pose Brush
 
 Cloth Sculpting
    Tools like the :doc:`Cloth Filter </sculpt_paint/sculpting/tools/cloth_filter>`
-   and :doc:`Cloth Brush </sculpt_paint/sculpting/tools/cloth>`
+   and :doc:`Cloth Brush </sculpt_paint/sculpting/brushes/cloth>`
    work especially well when only simulating small areas at a time.
    Face Sets can very easily be created with Expand to assign areas of action.
 

manual/sculpt_paint/sculpting/editing/mask.rst

@@ -115,7 +115,7 @@ Type
    Smooth/Sharpen Mask
       Changes the sharpness of the mask edge.
       Using this can be faster and more consistent than smoothing the mask
-      with the :doc:`Mask </sculpt_paint/sculpting/tools/mask>` brush.
+      with the :doc:`Mask </sculpt_paint/sculpting/brushes/mask>` brush.
    Grow/Shrink Mask
       Further grow or shrink the mask along the surface of the mesh.
    Increase/Decrease Contrast

manual/sculpt_paint/sculpting/editing/sculpt.rst

@@ -145,23 +145,23 @@ or from right to left for a negative effect.
 Smooth
    Smooths the positions of the vertices to either polish surfaces or remove volume from larger shapes.
    Especially useful to fix most of the artifacts of the voxel remesher.
-   This filter works similar to the :doc:`Smooth </sculpt_paint/sculpting/tools/smooth>` brush.
+   This filter works similar to the :doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>` brush.
 Surface Smooth
    Eliminates irregularities of the mesh by making the positions
    of the vertices more uniform while preserving the volume of the object.
    This filter works similar to the *Surface* deformation type of the
-   :doc:`Smooth </sculpt_paint/sculpting/tools/smooth>` brush.
+   :doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>` brush.
 Inflate
    Displaces vertices uniformly along their normal.
-   This filter works similar to the :doc:`Inflate </sculpt_paint/sculpting/tools/inflate>` brush.
+   This filter works similar to the :doc:`Inflate </sculpt_paint/sculpting/brushes/inflate>` brush.
 Relax Topology
    Tries to create an even distribution of quads without deforming the volume of the mesh.
    This filter works the same as holding :kbd:`Shift` with the
-   :doc:`Slide Relax </sculpt_paint/sculpting/tools/slide_relax>` brush.
+   :doc:`Slide Relax </sculpt_paint/sculpting/brushes/slide_relax>` brush.
 Relax Face Sets
    This will remove the jagged lines visible after drawing or creating a face set.
    This filter works the same as holding :kbd:`Shift` with the
-   :doc:`Draw Face Set </sculpt_paint/sculpting/tools/draw_facesets>` brush.
+   :doc:`Draw Face Set </sculpt_paint/sculpting/brushes/draw_facesets>` brush.
 Sharpen
    Sharpens and smooths the mesh based on its curvature,
    resulting in pinching hard edges and polishing flat surfaces.
@@ -171,7 +171,7 @@ Enhance Details
    Increases the high frequency surface details of the mesh
    by intensifying the difference between creases and valleys.
    This filter works similar to the inverted direction of the
-   :doc:`Smooth </sculpt_paint/sculpting/tools/smooth>` brush.
+   :doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>` brush.
 Erase Displacement
    Deletes displacement information of
    the :doc:`Multires Modifier </modeling/modifiers/generate/multiresolution>`,
@@ -198,7 +198,7 @@ Sample Color
    :Shortcut:  :kbd:`Shift-X`
 
 
-Adjust the brush color of the :doc:`/sculpt_paint/sculpting/tools/paint` tool to the color under the mouse cursor.
+Adjust the brush color of the :doc:`/sculpt_paint/sculpting/brushes/paint` tool to the color under the mouse cursor.
 
 
 .. _bpy.ops.sculpt.set_pivot_position:

manual/sculpt_paint/sculpting/introduction/adaptive.rst

@@ -74,9 +74,9 @@ Use :kbd:`R` to define the resolution and :kbd:`Ctrl-R` to flood fill the resolu
 
 .. figure:: /images/sculpt-paint_sculpt_dyntopo_detail.png
 
-Brushes like :doc:`Simplify </sculpt_paint/sculpting/tools/simplify>`,
-:doc:`Snake Hook </sculpt_paint/sculpting/tools/snake_hook>`
-and :doc:`Clay Strips </sculpt_paint/sculpting/tools/clay_strips>` work especially well with this feature.
+Brushes like :doc:`Density </sculpt_paint/sculpting/brushes/density>`,
+:doc:`Snake Hook </sculpt_paint/sculpting/brushes/snake_hook>`
+and :doc:`Clay Strips </sculpt_paint/sculpting/brushes/clay_strips>` work especially well with this feature.
 
 
 .. seealso::
@@ -120,11 +120,11 @@ since any edits to the base mesh will result in corrupted subdivision details.
    Pay attention to the topology that you sculpt and how much it gets stretched.
    If more resolution is needed you can always subdivide another time,
    but there will be worse performance and slower level switching once more than 5 subdivisions are used.
-   Alternatively use the :doc:`Slide Relax </sculpt_paint/sculpting/tools/slide_relax>`
+   Alternatively use the :doc:`Slide Relax </sculpt_paint/sculpting/brushes/slide_relax>`
    brush to slide topology to where it is needed.
 
-Additional brushes like the :doc:`Multires Eraser </sculpt_paint/sculpting/tools/multires_displacement_eraser>` and
-:doc:`Multires Smear </sculpt_paint/sculpting/tools/multires_displacement_smear>` are recommended for adjustments.
+Additional brushes like the :doc:`Multires Eraser </sculpt_paint/sculpting/brushes/multires_displacement_eraser>` and
+:doc:`Multires Smear </sculpt_paint/sculpting/brushes/multires_displacement_smear>` are recommended for adjustments.
 
 Here are general shortcuts to use the feature.
 

manual/sculpt_paint/sculpting/introduction/brush.rst

@@ -17,7 +17,7 @@ The inner ring of the brush cursor is used to visualize the strength of the brus
     How closely the cursor follows the curvature of the mesh can be changed in
     the :doc:`Brush Settings </sculpt_paint/sculpting/tool_settings/brush_settings>` with "Normal Radius".
     This can make hard surface sculpting easier, for example with the
-    :doc:`Scrape </sculpt_paint/sculpting/tools/scrape>` brush.
+    :doc:`Scrape </sculpt_paint/sculpting/brushes/scrape>` brush.
 
 The brush is also used for other :doc:`tools </sculpt_paint/sculpting/tools/index>` in the toolbar
 to better display how that tool works. For example, the :ref:`Box Trim <tool-box-trim>`
@@ -34,34 +34,34 @@ More information on sculpting brushes in the :doc:`Toolbar </sculpt_paint/sculpt
 .. figure:: /images/sculpt-paint_sculpting_introduction_common_brushes.png
     :align: left
 
-:doc:`Clay Strips </sculpt_paint/sculpting/tools/clay_strips>`
+:doc:`Clay Strips </sculpt_paint/sculpting/brushes/clay_strips>`
     Block out broad shapes and build up volumes before refining them further.
 
-:doc:`Grab </sculpt_paint/sculpting/tools/grab>`
+:doc:`Grab </sculpt_paint/sculpting/brushes/grab>`
     Move geometry across the screen for general shaping.
 
-:doc:`Smooth </sculpt_paint/sculpting/tools/smooth>`
+:doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>`
     Smooth and shrink surfaces to remove noise or flatten shapes.
 
-:doc:`Draw </sculpt_paint/sculpting/tools/draw>`
+:doc:`Draw </sculpt_paint/sculpting/brushes/draw>`
     Generic adding and subtracting on surfaces.
     This brush is often customized with different stroke methods and textures for various effects.
 
-:doc:`Scrape </sculpt_paint/sculpting/tools/scrape>`
+:doc:`Scrape </sculpt_paint/sculpting/brushes/scrape>`
     Scrape and fill surfaces either for hard surface sculpting or more aggressive smoothing.
 
-:doc:`Inflate </sculpt_paint/sculpting/tools/inflate>`
+:doc:`Inflate </sculpt_paint/sculpting/brushes/inflate>`
     Inflate or shrink volumes or surfaces.
     Especially useful for controlling the thickness of cylindrical shapes.
 
-:doc:`Draw Sharp </sculpt_paint/sculpting/tools/draw_sharp>`
+:doc:`Draw Sharp </sculpt_paint/sculpting/brushes/draw_sharp>`
     Same as *Draw* but with a much sharper falloff. Useful for adding creases, cracks and other sharp edges.
 
-:doc:`Crease </sculpt_paint/sculpting/tools/crease>`
+:doc:`Crease </sculpt_paint/sculpting/brushes/crease>`
     A mix of the *Draw* and *Pinch* brushes.
     Useful for creating detailed creases or sharpening existing creases for additional polish.
 
-:doc:`Snake Hook </sculpt_paint/sculpting/tools/snake_hook>`.
+:doc:`Snake Hook </sculpt_paint/sculpting/brushes/snake_hook>`.
     Similar to *Grab* but this brush will dynamically let go and pick up geometry during the stroke.
     The dragged geometry is also following the angle of the stroke, making it very useful for
     pulling geometry out.

manual/sculpt_paint/sculpting/introduction/cloth_sculpting.rst

@@ -21,10 +21,10 @@ are :doc:`pinned </physics/cloth/settings/shape>` in the simulation.
 Another example is with :doc:`auto-masked </sculpt_paint/sculpting/controls>` face set boundaries.
 The sculpt mode :ref:`gravity <bpy.types.Sculpt.gravity>` factor is also applied on the cloth physics.
 
-The main brushes and tools for this feature are the :doc:`Cloth Brush </sculpt_paint/sculpting/tools/cloth>`
+The main brushes and tools for this feature are the :doc:`Cloth Brush </sculpt_paint/sculpting/brushes/cloth>`
 and :doc:`Cloth Filter </sculpt_paint/sculpting/tools/cloth_filter>`,
-but other transform brushes like :doc:`Pose </sculpt_paint/sculpting/tools/pose>` and
-:doc:`Boundary </sculpt_paint/sculpting/tools/boundary>` also support cloth sculpting in the brush settings.
+but other transform brushes like :doc:`Pose </sculpt_paint/sculpting/brushes/pose>` and
+:doc:`Boundary </sculpt_paint/sculpting/brushes/boundary>` also support cloth sculpting in the brush settings.
 
 A demo file for trying out the various brushes and tools is available
 `here <https://www.blender.org/download/demo-files/#sculpting>`__.

manual/sculpt_paint/sculpting/introduction/painting.rst

@@ -12,8 +12,8 @@ common actions related to the sculpting workflow are contained in the same mode,
 Other sculpt mode features such as face sets, masking and filters can also be used with painting tools.
 
 The painting functionality in Sculpt Mode is limited to a
-:doc:`Paint </sculpt_paint/sculpting/tools/paint>`
-and :doc:`Smear </sculpt_paint/sculpting/tools/smear>` brush,
+:doc:`Paint </sculpt_paint/sculpting/brushes/paint>`
+and :doc:`Smear </sculpt_paint/sculpting/brushes/smear>` brush,
 as well as a :doc:`Color Filter </sculpt_paint/sculpting/tools/color_filter>`
 and :doc:`Mask by Color </sculpt_paint/sculpting/tools/mask_by_color>` tool.
 

manual/sculpt_paint/sculpting/introduction/transforming.rst

@@ -19,6 +19,6 @@ Optionally instead of keeping the transform tools active, you can enable the
    In that case move the pivot point somewhere else to be able to click on the desired surface.
 
 Apart from the transform tools there are also special brushes to move,
-rotate and scale the topology like :doc:`Pose </sculpt_paint/sculpting/tools/pose>`,
-:doc:`Boundary </sculpt_paint/sculpting/tools/boundary>`
-and :doc:`Elastic Deform </sculpt_paint/sculpting/tools/elastic_deform>`.
+rotate and scale the topology like :doc:`Pose </sculpt_paint/sculpting/brushes/pose>`,
+:doc:`Boundary </sculpt_paint/sculpting/brushes/boundary>`
+and :doc:`Elastic Deform </sculpt_paint/sculpting/brushes/elastic_deform>`.

manual/sculpt_paint/sculpting/introduction/visibility_masking_face_sets.rst

@@ -85,7 +85,7 @@ More options can be found in the :kbd:`Alt-W` pie menu.
 .. figure:: /images/sculpt-paint_sculpting_editing_face_set_pie.png
 
 Otherwise Face Sets can be created/edited with the
-:doc:`Draw Face Sets </sculpt_paint/sculpting/tools/draw_facesets>` brush,
+:doc:`Draw Face Sets </sculpt_paint/sculpting/brushes/draw_facesets>` brush,
 :doc:`/sculpt_paint/sculpting/tools/mask_tools`.
 They can also be edited with the
 :doc:`Edit Face Set </sculpt_paint/sculpting/tools/edit_face_set>` tool.

manual/sculpt_paint/sculpting/toolbar.rst

@@ -7,153 +7,15 @@ The amount of tools in sculpt mode is very extensive.
 This is an overview of all of them, categorized by their general functions.
 
 
-Add/Subtract Brushes
-====================
-
-.. figure:: /images/sculpt-paint_sculpting_toolbar_add_subt_brushes.png
-   :align: right
-
-Recognizable by their blue icon and cursor.
-These brushes generally push vertices outwards and inwards.
-
-:doc:`/sculpt_paint/sculpting/tools/draw`
-   The standard brush for pushing vertices inwards and outwards from the surface direction.
-
-:doc:`/sculpt_paint/sculpting/tools/draw_sharp`
-   Same as *Draw* but with a much sharper :doc:`Falloff </sculpt_paint/brush/falloff>`.
-   Useful for creating creases and sharp angles.
-
-:doc:`/sculpt_paint/sculpting/tools/clay`
-   Similar to the *Draw* brush but with a flattening effect and subtle smoothing.
-   Useful for polishing and building volumes.
-
-:doc:`/sculpt_paint/sculpting/tools/clay_strips`
-   The same as the *Clay* brush, but more aggressive with a square falloff.
-   A common standard for building rough volumes.
-
-:doc:`/sculpt_paint/sculpting/tools/layer`
-   Draw with a fixed height. Useful for adding flat layers to a surface.
-
-:doc:`/sculpt_paint/sculpting/tools/inflate`
-   Moves the mesh in multiple direction. Useful for inflating or shrinking surfaces and volumes.
-
-:doc:`/sculpt_paint/sculpting/tools/blob`
-   Magnifies the mesh as you draw. Useful for an additional inflation effect on the stroke.
-
-:doc:`/sculpt_paint/sculpting/tools/crease`
-   Same as *Blob* but with a pinching effect. Useful for creating and polishing sharp creases.
-
-Contrast Brushes
-================
-
-.. figure:: /images/sculpt-paint_sculpting_toolbar_contrast_brushes.png
-   :align: right
-
-Recognizable by their red icon and cursor.
-These brushes generally flatten or heighten the contrast of the surface.
-
-:doc:`/sculpt_paint/sculpting/tools/smooth`
-   Smooths out irregularities in the surface and shrinks volumes by averaging the vertices positions.
-   An essential brush that is frequently used.
-
-:doc:`/sculpt_paint/sculpting/tools/flatten`
-   Pushes vertices to an average height to create a flat plateau.
-
-:doc:`/sculpt_paint/sculpting/tools/fill`
-   Pushes surfaces outwards. Useful for filling in holes and crevices.
-
-:doc:`/sculpt_paint/sculpting/tools/scrape`
-   Pushes surfaces inwards. This is the most common brush for flattening meshes.
-
-:doc:`/sculpt_paint/sculpting/tools/multiplane_scrape`
-   Scrapes the mesh with two angled planes at the same time, producing a sharp edge between them.
-
-
-Transform Brushes
-=================
-
-.. figure:: /images/sculpt-paint_sculpting_toolbar_transform_brushes.png
-   :align: right
-
-Recognizable by their yellow icon and cursor.
-These brushes generally move, pinch and magnify the mesh.
-
-:doc:`/sculpt_paint/sculpting/tools/pinch`
-   Pulls vertices towards the center of the brush. Useful for polishing angles and creases.
-
-:doc:`/sculpt_paint/sculpting/tools/grab`
-   Moves vertices along with the mouse. An essential brush for building shapes and adjusting proportions.
-
-:doc:`/sculpt_paint/sculpting/tools/elastic_deform`
-   Used to simulate realistic deformations such as grabbing or twisting of :term:`Elastic` objects.
-
-:doc:`/sculpt_paint/sculpting/tools/snake_hook`
-   Pulls vertices along with the stroke to create long, snake-like forms.
-
-:doc:`/sculpt_paint/sculpting/tools/thumb`
-   Same as *Grab* but moves vertices along the surface direction. Useful for preserving specific surfaces.
-
-:doc:`/sculpt_paint/sculpting/tools/pose`
-   Simulating an armature-like deformations. Useful for quick posing and transformations.
-
-:doc:`/sculpt_paint/sculpting/tools/nudge`
-   Similar as *Thumb* but dynamically picks up vertices like the *Snake Hook*.
-   Useful for nudging something along the mesh surface.
-
-:doc:`/sculpt_paint/sculpting/tools/rotate`
-   Rotates vertices within the brush in the direction mouse.
-
-:doc:`/sculpt_paint/sculpting/tools/slide_relax`
-   Slides the topology of the mesh in the direction of the stroke
-   while preserving the geometrical shape of the mesh.
-   Also useful for redistributing topology where it is needed.
-
-:doc:`/sculpt_paint/sculpting/tools/boundary`
-   Transform mesh boundaries specifically with various deformations.
-
-
-General Brushes
+Sculpting Tools
 ===============
 
-.. figure:: /images/sculpt-paint_sculpting_toolbar_general_brushes.png
+.. figure:: /images/sculpt-paint_sculpting_toolbar_brush.png
    :align: right
+   :width: 220
 
-No clear color assignment.
-These brushes are general purpose brushes or specific.
-
-:doc:`/sculpt_paint/sculpting/tools/cloth`
-   Simulates cloth to create folds and draping, which can be sculpted further.
-
-:doc:`/sculpt_paint/sculpting/tools/simplify`
-   Cleans up geometry by collapsing short edges.
-
-:doc:`/sculpt_paint/sculpting/tools/mask`
-   Paints a selection on parts of the mesh to be unaffected by other brushes.
-
-:doc:`/sculpt_paint/sculpting/tools/draw_facesets`
-   Paint new or extend existing face sets.
-
-:doc:`/sculpt_paint/sculpting/tools/multires_displacement_eraser`
-   Remove displacement information on a Multiresolution modifier.
-
-:doc:`/sculpt_paint/sculpting/tools/multires_displacement_smear`
-   Smear displacement information on a Multiresolution modifier.
-
-
-Painting Brushes
-================
-
-.. figure:: /images/sculpt-paint_sculpting_toolbar_paint.png
-   :align: right
-
-Recognizable by their green icon.
-These brushes are used for painting color attributes within sculpt mode.
-
-:doc:`/sculpt_paint/sculpting/tools/paint`
-   Paint on the vertices of your mesh via color attributes.
-
-:doc:`/sculpt_paint/sculpting/tools/smear`
-   Smears the vertex colors via color attributes.
+:doc:`/sculpt_paint/sculpting/tools/brush_tool`
+   Tool to use for any of the *Sculpt* mode brushes.
 
 
 Gesture Tools

manual/sculpt_paint/sculpting/tools/brush_tool.rst

@@ -11,5 +11,6 @@ Brush
 Tool to use for any of the *Sculpt* mode brushes. Activating a brush from an asset shelf or brush
 asset selector will also activate this tool for convenience.
 
-See :doc:`brushes </sculpt_paint/sculpting/brushes>` for a detailed list of all brushes and their
-options.
+See :doc:`brushes </sculpt_paint/sculpting/brushes/index>` (or the
+:doc:`overview </sculpt_paint/sculpting/brushes/overview>`) for a detailed list of all brushes and
+their options.

manual/sculpt_paint/sculpting/tools/cloth_filter.rst

@@ -8,13 +8,13 @@ Cloth Filter
    :Mode:      Sculpt Mode
    :Tool:      :menuselection:`Toolbar --> Cloth Filter`
 
-This tool works similar to the :doc:`Cloth Brush </sculpt_paint/sculpting/tools/cloth>`,
+This tool works similar to the :doc:`Cloth Brush </sculpt_paint/sculpting/brushes/cloth>`,
 however, it applies a cloth simulation to all vertices in the mesh at the same time.
 Click and drag away from the object for a positive effect and towards for a negative effect.
 
 .. tip::
 
-   Vertices can be "pinned" by :doc:`masking </sculpt_paint/sculpting/tools/mask>` vertices
+   Vertices can be "pinned" by :doc:`masking </sculpt_paint/sculpting/brushes/mask>` vertices
    that should remain stationary, or by using :ref:`Face Sets <sculpting-editing-facesets>`.
 
 

manual/sculpt_paint/sculpting/tools/mesh_filter.rst

@@ -24,13 +24,13 @@ Filter Type
    :Smooth:
       Smooths the positions of the vertices to either polish surfaces or remove volume from larger shapes.
       Especially useful to fix most of the artifacts of the voxel remesher.
-      This filter works similar to the :doc:`Smooth </sculpt_paint/sculpting/tools/smooth>` brush.
+      This filter works similar to the :doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>` brush.
    :Scale:
       Increases the size of the mesh.
       This filter works similar to the :ref:`Scale Transform <bpy.ops.transform.resize>`.
    :Inflate:
       Displaces vertices uniformly along their normal.
-      This filter works similar to the :doc:`Inflate </sculpt_paint/sculpting/tools/inflate>` brush.
+      This filter works similar to the :doc:`Inflate </sculpt_paint/sculpting/brushes/inflate>` brush.
    :Sphere:
       Morphs the mesh progressively into a sphere.
       This filter works similar to the :ref:`To Sphere Transform <bpy.ops.transform.tosphere>`.
@@ -40,16 +40,16 @@ Filter Type
    :Relax:
       Tries to create an even distribution of quads without deforming the volume of the mesh.
       This filter works the same as holding :kbd:`Shift` with the
-      :doc:`Slide Relax </sculpt_paint/sculpting/tools/slide_relax>` brush.
+      :doc:`Slide Relax </sculpt_paint/sculpting/brushes/slide_relax>` brush.
    :Relax Face Sets:
       This will remove the jagged lines visible after drawing or creating a face set.
       This filter works the same as holding :kbd:`Shift` with the
-      :doc:`Draw Face Set </sculpt_paint/sculpting/tools/draw_facesets>` brush.
+      :doc:`Draw Face Set </sculpt_paint/sculpting/brushes/draw_facesets>` brush.
    :Surface Smooth:
       Eliminates irregularities of the mesh by making the positions
       of the vertices more uniform while preserving the volume of the object.
       This filter works similar to the *Surface* deformation type of the
-      :doc:`Smooth </sculpt_paint/sculpting/tools/smooth>` brush.
+      :doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>` brush.
 
       Shape Preservation
          How much of the original shape is preserved when smoothing.
@@ -73,7 +73,7 @@ Filter Type
       Increases the high frequency surface details of the mesh
       by intensifying the difference between creases and valleys.
       This filter works similar to the inverted direction of the
-      :doc:`Smooth </sculpt_paint/sculpting/tools/smooth>` brush.
+      :doc:`Smooth </sculpt_paint/sculpting/brushes/smooth>` brush.
    :Erase Displacement:
       Deletes displacement information of
       the :doc:`Multires Modifier </modeling/modifiers/generate/multiresolution>`,

manual/sculpt_paint/texture_paint/brushes.rst

@@ -5,10 +5,10 @@ Brushes
 
 Brushes for *Texture Paint* bundled in the *Essentials* library.
 
-Draw
-   The normal brush, paints a swath of color.
+Paint Texture
+   The normal brush, draws a swath of color.
 
-Soften
+Blur Texture
    Uses a "blur effect" to soften or sharpen the image.
 
    Direction
@@ -31,11 +31,11 @@ Soften
       :Gaussian: Gaussian will sample the pixels near the center of the brush most.
       :Box: Box samples all surrounding pixels equally.
 
-Smear
+Smear Texture
    When you click, takes the colors under the cursor, and blends them in the direction you move the mouse.
    Similar to the "smudge" tool of *Gimp*.
 
-Clone
+Clone Texture
    Copies the colors from the specified image (or location of the same image) to the active image.
 
    In 3D projective painting the clone cursor can be set with :kbd:`Ctrl-LMB`.
@@ -52,7 +52,7 @@ Clone
    Alpha (2D only)
       Opacity of the clone image display.
 
-Fill
+Fill Texture
    It can be used to fill large areas of the image with the brush color.
    The tool fills adjacent pixels that have a color value similar to the pixel you clicked on.
 
@@ -76,7 +76,7 @@ Fill
       regardless of whether the options are activated
       in the :doc:`External </sculpt_paint/texture_paint/tool_settings/options>` panel.
 
-Mask
+Mask Texture
    This brush paints gray-scale values on the mask texture
    specified in the :doc:`Mask panel </sculpt_paint/texture_paint/tool_settings/mask>`.
    Any masked surfaces will not be affected by other paint brushes, similar to

manual/sculpt_paint/vertex_paint/brushes.rst

@@ -5,19 +5,16 @@ Brushes
 
 Brushes for *Vertex Paint* bundled in the *Essentials* library.
 
-Draw
+Paint Vertex
    Paints a specified color over the object.
 
-Blur
+Blur Vertex
    Smooths out the colors of adjacent vertices. In this mode the Color
    Value is ignored. The strength defines how much the colors are blurred.
 
-Average
+Average Vertex
    Smooths color by painting the average resulting color from all colors under the brush.
 
-Smear
+Smear Vertex
    Smudges colors by grabbing the colors under the brush and "dragging" them.
    This can be imagined as a finger painting tool.
-
-Brush
-   Tool to use for any of the vertex paint :doc:`brushes <brushes>`.

manual/sculpt_paint/weight_paint/brushes.rst

@@ -3,7 +3,7 @@
 Brushes
 *******
 
-Draw
+Paint Weight
    Paints a specified weight over the object.
 
    Blend
@@ -40,13 +40,13 @@ Draw
          Smooths out the weighting of adjacent vertices. In this mode the Weight
          Value is ignored. The strength defines how much the smoothing is applied.
 
-Blur
+Blur Weight
    Smooths out the weighting of adjacent vertices. In this mode the Weight
    Value is ignored. The strength defines how much the smoothing is applied.
 
-Average
+Average Weight
    Smooths weights by painting the average resulting weight from all weights under the brush.
 
-Smear
+Smear Weight
    Smudges weights by grabbing the weights under the brush and "dragging" them.
    This can be imagined as a finger painting tool.