build_files/.htaccess

@@ -270,5 +270,8 @@ RedirectMatch "^/manual/{lang}/{version}/sculpt_paint/curves_sculpting/tools/\
                    (index|add_curves|comb_curves|delete_curves|density_curves|grow_shrink_curves|\
                    pinch_curves|puff_curves|selection_paint|slide_curves|smooth_curves|snake_hook_curves).html" \
                 "^/manual/{lang}/{version}/sculpt_paint/curves_sculpting/brushes/$1.html"
+# Grease pencil draw tools
+RedirectMatch "^/manual/{lang}/{version}/grease_pencil/modes/draw/tools/(draw|erase|fill|tint).html" \
+                "^/manual/{lang}/{version}/sculpt_paint/curves_sculpting/brushes/$1.html"
 # Texture paint tools converted to asset
 RedirectMatch "^/manual/{lang}/{version}/sculpt_paint/texture_paint/tools.html" "^/manual/{lang}/{version}/sculpt_paint/texture_paint/brushes.html"

manual/grease_pencil/materials/introduction.rst

@@ -58,7 +58,7 @@ to interactively preview how the material looks in the scene.
 Grease Pencil materials are data-blocks that can be :doc:`assigned </render/materials/assignment>`
 to one or more objects, and different materials can be assigned to different strokes.
 
-In Grease Pencil the :doc:`brush </grease_pencil/modes/draw/tools/index>`
+In Grease Pencil the :doc:`brush </grease_pencil/modes/draw/brushes/index>`
 settings together with the material used will define the look and feel of the final strokes.
 
 Materials slots in the :ref:`List view <ui-list-view>` also have some extra controls

manual/grease_pencil/modes/draw/brushes/draw.rst

@@ -1,15 +1,14 @@
-.. _tool-grease-pencil-draw-draw:
 
-*********
-Draw Tool
-*********
+**********
+Draw Brush
+**********
 
 .. reference::
 
    :Mode:      Draw Mode
-   :Tool:      :menuselection:`Toolbar --> Draw`
+   :Brush:     :menuselection:`Asset Shelf --> Draw`
 
-The Draw tool allows you to draw free-hand strokes.
+The Draw brush allows you to draw free-hand strokes.
 
 
 Brush Settings
@@ -284,6 +283,6 @@ Switching to the Erase Tool
 ---------------------------
 
 :kbd:`Ctrl-LMB` changes temporally to the active Erase tool.
-See :doc:`Erase Tool </grease_pencil/modes/draw/tools/erase>` for more information.
+See :doc:`Erase Tool </grease_pencil/modes/draw/brushes/erase>` for more information.
 
 You can also use :kbd:`B` to delete all the points in the selected drawing area.

manual/grease_pencil/modes/draw/brushes/erase.rst

@@ -1,15 +1,15 @@
 .. _tool-grease-pencil-draw-erase:
 
-**********
-Erase Tool
-**********
+***********
+Erase Brush
+***********
 
 .. reference::
 
    :Mode:      Draw Mode
-   :Tool:      :menuselection:`Toolbar --> Erase`
+   :Brush:     :menuselection:`Asset Shelf --> Erase`
 
-The Erase tool erase already drawn strokes.
+The Erase brush erases already drawn strokes.
 
 
 Brush Settings

manual/grease_pencil/modes/draw/brushes/fill.rst

@@ -1,15 +1,14 @@
-.. _tool-grease-pencil-draw-fill:
 
-*********
-Fill Tool
-*********
+**********
+Fill Brush
+**********
 
 .. reference::
 
    :Mode:      Draw Mode
-   :Tool:      :menuselection:`Toolbar --> Fill`
+   :Brush:      :menuselection:`Asset Shelf --> Fill`
 
-The Fill tool is used to automatically fill closed strokes areas.
+The Fill brush is used to automatically fill closed strokes areas.
 
 
 Brush Settings
@@ -248,4 +247,4 @@ Switch to Draw Tool
 
 Use :kbd:`Ctrl-LMB` to change temporary to the active draw tool.
 For example to manually cover small areas difficult to reach for the Fill tool.
-See :doc:`Draw Tool </grease_pencil/modes/draw/tools/draw>` for more information.
+See :doc:`Draw Tool </grease_pencil/modes/draw/brushes/draw>` for more information.

manual/grease_pencil/modes/draw/brushes/index.rst

@@ -0,0 +1,13 @@
+
+#########
+  Brushes
+#########
+
+.. toctree::
+   :maxdepth: 2
+
+   overview.rst
+   draw.rst
+   fill.rst
+   erase.rst
+   tint.rst

manual/grease_pencil/modes/draw/brushes/overview.rst

@@ -0,0 +1,19 @@
+
+********
+Overview
+********
+
+There are a number of brushes for draw mode bundled in the *Essentials* asset library. This is an
+overview of all of them.
+
+:doc:`Draw <draw>`
+   Draw free-hand strokes.
+
+:doc:`Fill <fill>`
+   Automatic fill closed strokes areas.
+
+:doc:`Erase <erase>`
+   Erase strokes.
+
+:doc:`Tint <tint>`
+   Colorize stroke points.

manual/grease_pencil/modes/draw/brushes/tint.rst

@@ -1,15 +1,15 @@
 .. _tool-grease-pencil-draw-tint:
 
-*********
-Tint Tool
-*********
+**********
+Tint Brush
+**********
 
 .. reference::
 
    :Mode:      Draw Mode
-   :Tool:      :menuselection:`Toolbar --> Tint`
+   :Brush:     :menuselection:`Brush --> Tint`
 
-The Tint tool allows you to paint onto strokes point mixing the material base color with a selected color.
+The Tint brush allows you to paint onto strokes point mixing the material base color with a selected color.
 
 
 Brush Settings

manual/grease_pencil/modes/draw/index.rst

@@ -7,6 +7,7 @@
    :maxdepth: 2
 
    introduction.rst
+   brushes/index.rst
    tools.rst
    tools/index.rst
    tool_settings/index.rst

manual/grease_pencil/modes/draw/tools.rst

@@ -10,17 +10,8 @@ Drawing Tools
 Cursor
    Change the location of the 3D Cursor.
 
-:ref:`Draw <tool-grease-pencil-draw-draw>`
-   Draw free-hand strokes.
-
-:ref:`Fill <tool-grease-pencil-draw-fill>`
-   Automatic fill closed strokes areas.
-
-:ref:`Erase <tool-grease-pencil-draw-erase>`
-   Erase strokes.
-
-:ref:`Tint <tool-grease-pencil-draw-tint>`
-   Colorize stroke points.
+:doc:`Brush <grease_pencil/modes/draw/brushes/overview>`
+   Tool to use for any of the drawing brushes.
 
 :ref:`Cutter <tool-grease-pencil-draw-cutter>`
    Cut strokes in between others.

manual/grease_pencil/modes/draw/tools/arc.rst

@@ -17,7 +17,7 @@ Tool Settings
 
 You can configure the brush main settings exposed on the Tool Settings for convenience.
 For the draw brushes configuration and settings see:
-:doc:`Draw Brush </grease_pencil/modes/draw/tools/draw>`.
+:doc:`Draw Brush </grease_pencil/modes/draw/brushes/draw>`.
 
 Subdivisions
    The number of stroke points between each stroke edge.

manual/grease_pencil/modes/draw/tools/box.rst

@@ -17,7 +17,7 @@ Tool Settings
 
 You can configure the brush main settings exposed on the Tool Settings for convenience.
 For the draw brushes configuration and settings see:
-:doc:`Draw Brush </grease_pencil/modes/draw/tools/draw>`.
+:doc:`Draw Brush </grease_pencil/modes/draw/brushes/draw>`.
 
 Subdivisions
    The number of stroke points between each stroke edge.

manual/grease_pencil/modes/draw/tools/brush.rst

@@ -0,0 +1,17 @@
+
+*****
+Brush
+*****
+
+.. reference::
+
+   :Mode:      Draw Mode
+   :Tool:      :menuselection:`Toolbar --> Brush`
+
+
+Tool to use for any of the Grease Pencil *Draw* mode brushes. Activating a brush from an asset
+shelf or brush selector will also activate this tool for convenience.
+
+See :doc:`brushes </grease_pencil/modes/draw/brushes/index>` (or the
+:doc:`overview </sculpt_paint/sculpting/brushes/overview>`) for a detailed list of all brushes and
+their options.

manual/grease_pencil/modes/draw/tools/circle.rst

@@ -17,7 +17,7 @@ Tool Settings
 
 You can configure the brush main settings exposed on the Tool Settings for convenience.
 For the draw brushes configuration and settings see:
-:doc:`Draw Brush </grease_pencil/modes/draw/tools/draw>`.
+:doc:`Draw Brush </grease_pencil/modes/draw/brushes/draw>`.
 
 Subdivisions
    The number of stroke points between each stroke edge.

manual/grease_pencil/modes/draw/tools/curve.rst

@@ -17,7 +17,7 @@ Tool Settings
 
 You can configure the brush main settings exposed on the Tool Settings for convenience.
 For the draw brushes configuration and settings see:
-:doc:`Draw Brush </grease_pencil/modes/draw/tools/draw>`.
+:doc:`Draw Brush </grease_pencil/modes/draw/brushes/draw>`.
 
 Subdivisions
    The number of stroke points between each stroke edge.

manual/grease_pencil/modes/draw/tools/index.rst

@@ -7,10 +7,7 @@
 .. toctree::
    :maxdepth: 2
 
-   draw.rst
-   fill.rst
-   erase.rst
-   tint.rst
+   brush.rst
    cutter.rst
    eyedropper.rst
    line.rst

manual/grease_pencil/modes/draw/tools/line.rst

@@ -17,7 +17,7 @@ Tool Settings
 
 You can configure the brush main settings exposed on the Tool Settings for convenience.
 For the draw brushes configuration and settings see:
-:doc:`Draw Brush </grease_pencil/modes/draw/tools/draw>`.
+:doc:`Draw Brush </grease_pencil/modes/draw/brushes/draw>`.
 
 Subdivisions
    The number of stroke points between each stroke edge.

manual/grease_pencil/modes/draw/tools/polyline.rst

@@ -17,7 +17,7 @@ Tool Settings
 
 You can configure the brush main settings exposed on the Tool Settings for convenience.
 For the draw brushes configuration and settings see:
-:doc:`Draw Brush </grease_pencil/modes/draw/tools/draw>`.
+:doc:`Draw Brush </grease_pencil/modes/draw/brushes/draw>`.
 
 Subdivisions
    The number of stroke points between each stroke edge.

manual/grease_pencil/modes/edit/grease_pencil_menu.rst

@@ -217,7 +217,7 @@ Boundary Strokes
    :Menu:      :menuselection:`Grease Pencil --> Clean Up --> Boundary Strokes`
 
 Removes boundary strokes used by the *Fill* tool.
-See :doc:`Fill tool </grease_pencil/modes/draw/tools/fill>` for more information.
+See :doc:`Fill tool </grease_pencil/modes/draw/brushes/fill>` for more information.
 
 Mode
    Active Frame Only

manual/grease_pencil/modes/sculpting/brushes.rst

@@ -0,0 +1,46 @@
+
+*****************
+Sculpting Brushes
+*****************
+
+Brushes for Grease Pencil *Sculpt* mode bundled in the *Essentials* library.
+See :doc:`Brush </grease_pencil/modes/sculpting/tool_settings/brush>` for more information.
+
+.. figure:: /images/grease-pencil_modes_sculpting_tools_brushes.png
+   :align: right
+
+Smooth Stroke
+   Eliminates irregularities in the area of the drawing
+   within the brush's influence by smoothing the positions of the points.
+
+Thickness Stroke
+   Increase or decrease the points thickness in the area of the drawing
+   within the brush's influence.
+
+Strength Stroke
+   Increase or decrease the points transparency (alpha) in the area of the drawing
+   within the brush's influence.
+
+Randomize Stroke
+   Add noise to the strokes in the area of the drawing
+   within the brush's influence by moving points location in a random way.
+
+Grab Stroke
+   Used to drag a group of points around. Unlike the other brushes,
+   Grab does not modify different points as the brush is dragged across the model.
+   Instead, Grab selects a group of points on mouse-down, and pulls them to follow the mouse.
+   The effect is similar to moving a group of points in Edit Mode with Proportional Editing enabled.
+
+Pull Stroke
+   Moves points in the direction of the brush stroke.
+
+Twist Stroke
+   Twist the points in counter-clockwise (CCW) or Clockwise (CW) rotation.
+
+Pinch Stroke
+   Pulls points towards the center of the brush.
+   The inverse setting is Inflate, in which points are pushed away from the center of the brush.
+
+Clone Stroke
+   Adds copies of the strokes in the clipboard in the center of the brush.
+   You have to copy the selected strokes you want into the clipboard with :kbd:`Ctrl-C` before using the tool.

manual/grease_pencil/modes/sculpting/index.rst

@@ -7,5 +7,6 @@
    :maxdepth: 2
 
    introduction.rst
+   brushes.rst
    tools.rst
    tool_settings/brush.rst

manual/grease_pencil/modes/sculpting/tools.rst

@@ -4,48 +4,8 @@
 Sculpting Tools
 ***************
 
-For Grease Pencil sculpt modes each brush type is exposed as a tool,
-the brush can be changed in the Tool Settings.
-See :doc:`Brush </grease_pencil/modes/sculpting/tool_settings/brush>` for more information.
-
-.. figure:: /images/grease-pencil_modes_sculpting_tools_brushes.png
-   :align: right
-
-Smooth
-   Eliminates irregularities in the area of the drawing
-   within the brush's influence by smoothing the positions of the points.
-
-Thickness
-   Increase or decrease the points thickness in the area of the drawing
-   within the brush's influence.
-
-Strength
-   Increase or decrease the points transparency (alpha) in the area of the drawing
-   within the brush's influence.
-
-Randomize
-   Add noise to the strokes in the area of the drawing
-   within the brush's influence by moving points location in a random way.
-
-Grab
-   Used to drag a group of points around. Unlike the other brushes,
-   Grab does not modify different points as the brush is dragged across the model.
-   Instead, Grab selects a group of points on mouse-down, and pulls them to follow the mouse.
-   The effect is similar to moving a group of points in Edit Mode with Proportional Editing enabled.
-
-Push
-   Moves points in the direction of the brush stroke.
-
-Twist
-   Twist the points in counter-clockwise (CCW) or Clockwise (CW) rotation.
-
-Pinch/Inflate
-   Pulls points towards the center of the brush.
-   The inverse setting is Inflate, in which points are pushed away from the center of the brush.
-
-Clone
-   Adds copies of the strokes in the clipboard in the center of the brush.
-   You have to copy the selected strokes you want into the clipboard with :kbd:`Ctrl-C` before using the tool.
+Brush
+   Tool to use for any of the sculpting :doc:`brushes <brushes>`.
 
 :ref:`Annotate <tool-annotate-freehand>`
    Draw free-hand annotation.

manual/grease_pencil/modes/vertex_paint/brushes.rst

@@ -0,0 +1,23 @@
+
+********************
+Vertex Paint Brushes
+********************
+
+Brushes for Grease Pencil *Vertex Paint* mode bundled in the *Essentials* library.
+
+Paint Point Color
+   Paints a specified color over the object.
+
+Blur Point Color
+   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 Point Color
+   Smooths color by painting the average resulting color from all colors under the brush.
+
+Smear Point Color
+   Smudges colors by grabbing the colors under the brush and "dragging" them.
+   This can be imagined as a finger painting tool.
+
+Replace Point Color
+   Change the color only to the stroke points that already have a color applied.

manual/grease_pencil/modes/vertex_paint/index.rst

@@ -7,6 +7,7 @@
    :maxdepth: 2
 
    introduction.rst
+   brushes.rst
    tools.rst
    tool_settings/brush.rst
    editing.rst

manual/grease_pencil/modes/vertex_paint/tools.rst

@@ -6,22 +6,8 @@ Vertex Paint Tools
 .. figure:: /images/grease-pencil_modes_vertex-paint_tools_brushes.png
    :align: right
 
-Draw
-   Paints a specified color over the object.
-
-Blur
-   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
-   Smooths color by painting the average resulting color from all colors under the brush.
-
-Smear
-   Smudges colors by grabbing the colors under the brush and "dragging" them.
-   This can be imagined as a finger painting tool.
-
-Replace
-   Change the color only to the stroke points that already have a color applied.
+Brush
+   Tool to use for any of the vertex paint :doc:`brushes <brushes>`.
 
 :ref:`Annotate <tool-annotate-freehand>`
    Draw free-hand annotation.

manual/grease_pencil/modes/weight_paint/brushes.rst

@@ -0,0 +1,20 @@
+
+********************
+Weight Paint Brushes
+********************
+
+Brushes for Grease Pencil *Weight Paint* mode bundled in the *Essentials* library.
+
+Paint Point Weight
+   Paints a specified weight over the strokes.
+
+Blur Point Weight
+   Smooths out the weighting of adjacent points. In this mode the Weight
+   Value is ignored. The strength defines how much the smoothing is applied.
+
+Average Point Weight
+   Smooths weights by painting the average resulting weight from all weights under the brush.
+
+Smear Point Weight
+   Smudges weights by grabbing the weights under the brush and "dragging" them.
+   This can be imagined as a finger painting tool.

manual/grease_pencil/modes/weight_paint/index.rst

@@ -7,6 +7,7 @@
    :maxdepth: 2
 
    introduction.rst
+   brushes.rst
    tools.rst
    tool_settings/index.rst
    weights_menu.rst

manual/grease_pencil/modes/weight_paint/tools.rst

@@ -11,19 +11,8 @@ See :doc:`Brush </grease_pencil/modes/weight_paint/tool_settings/brush>` for mor
 .. figure:: /images/grease-pencil_modes_weight-paint_tools_brushes.png
    :align: right
 
-Draw
-   Paints a specified weight over the strokes.
-
-Blur
-   Smooths out the weighting of adjacent points. In this mode the Weight
-   Value is ignored. The strength defines how much the smoothing is applied.
-
-Average
-   Smooths weights by painting the average resulting weight from all weights under the brush.
-
-Smear
-   Smudges weights by grabbing the weights under the brush and "dragging" them.
-   This can be imagined as a finger painting tool.
+Brush
+   Tool to use for any of the weight paint :doc:`brushes <brushes>`.
 
 :ref:`Annotate <tool-annotate-freehand>`
    Draw free-hand annotation.

manual/sculpt_paint/sculpting/tools/brush_tool.rst

@@ -9,7 +9,7 @@ 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.
+selector will also activate this tool for convenience.
 
 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

manual/sculpt_paint/vertex_paint/brushes.rst

@@ -3,7 +3,7 @@
 Brushes
 *******
 
-Brushes for *Vertex Paint* bundled in the *Essentials* library.
+Brushes for *Vertex Paint* mode bundled in the *Essentials* library.
 
 Paint Vertex
    Paints a specified color over the object.

manual/sculpt_paint/weight_paint/brushes.rst

@@ -3,6 +3,8 @@
 Brushes
 *******
 
+Brushes for *Weight Paint* mode bundled in the *Essentials* library.
+
 Paint Weight
    Paints a specified weight over the object.