build_files/.htaccess

@@ -249,3 +249,5 @@ RedirectMatch "^/manual/{lang}/{version}/movie_clip/introduction.html" "^/manual
 RedirectMatch "^/manual/{lang}/{version}/getting_started/about/introduction.html" "^/manual/{lang}/{version}/getting_started/about/index.html"
 RedirectMatch "^/manual/{lang}/{version}/animation/armatures/bones/properties/introduction.html" "^/manual/{lang}/{version}/animation/armatures/bones/properties/index.html"
 RedirectMatch "^/manual/{lang}/{version}/advanced/command_line/introduction.html" "^/manual/{lang}/{version}/advanced/command_line/index.html"
+
+RedirectMatch "^/manual/{lang}/{version}/sculpt_paint/brush/brush.html" "^/manual/{lang}/{version}/sculpt_paint/brush/introduction.html"

manual/files/data_blocks.rst

@@ -98,7 +98,7 @@ Pack
      - |none|
      - Skeleton used to deform meshes.
        Used as data of armature objects, and by the Armature Modifier.
-   * - :doc:`Brush </sculpt_paint/brush/brush>`
+   * - :doc:`Brush </sculpt_paint/brush/index>`
      - |tick|
      - |none|
      - Used by paint tools.

manual/sculpt_paint/brush/brush.rst

@@ -1,51 +0,0 @@
-.. _bpy.types.Brush:
-.. _bpy.ops.brush:
-.. _bpy.types.UnifiedPaintSettings:
-
-*******
-Brushes
-*******
-
-.. reference::
-
-   :Mode:      Sculpt Mode
-   :Panel:     :menuselection:`Sidebar --> Tools --> Brushes`
-
-For painting/sculpting modes each brush type is exposed as a tool in the toolbar.
-The brush on the other hand is a saved preset of all the brush settings, including a name and thumbnail.
-
-All these settings can be found and changed here in the tool setting (brush, texture, stroke, falloff & cursor).
-
-.. figure:: /images/sculpt-paint_brush_brush_data-block-menu.png
-   :align: right
-
-   Brush panel in the tool settings.
-
-Brushes
-   Clicking on the brush thumbnail will open the :ref:`ui-data-block` to select a brush.
-
-   Add Brush (Duplicate icon)
-      When you add a brush, the new brush is a duplicate of the current one.
-   Fake User (Shield icon)
-      Enabling this button will ensure that the brush will not be deleted,
-      even if it is not used by any tool.
-   Unlink Data-Block (Cross icon)
-      Unassign the brush from the active tool.
-      Hold :kbd:`Shift` to remove the brush from all users,
-      so it will be deleted upon reloading the file or purging orphan data.
-
-   Brush Specials (Arrow button)
-      Enabled Modes
-         Enable the brush to be used in different (even multiple) modes.
-         For example, the exact same brushes are used in both Weight Paint
-         and Vertex Paint mode.
-      Tool Selection
-         Transfer the brush preset to be used by a different brush type.
-      Reset Brush
-         Reset all brush settings to the default values of the current brush type.
-
-.. _bpy.types.Brush.use_custom_icon:
-.. _bpy.types.Brush.icon_filepath:
-
-   Custom Icon
-      Define a custom brush thumbnail from an image file.

manual/sculpt_paint/brush/index.rst

@@ -1,6 +1,6 @@
 
 #########
-  Brush
+  Brushes
 #########
 
 .. toctree::
@@ -15,7 +15,6 @@ Brush Settings
 .. toctree::
    :maxdepth: 1
 
-   brush.rst
    brush_settings.rst
    texture.rst
    stroke.rst

manual/sculpt_paint/brush/introduction.rst

@@ -33,3 +33,56 @@ Move the mouse right or left to increase/reduce the value
 Finally confirm (:kbd:`LMB`, :kbd:`Return`) or cancel (:kbd:`RMB`, :kbd:`Esc`).
 
 You can also invert the brush direction/effect by holding :kbd:`Ctrl`.
+
+.. _bpy.types.Brush:
+.. _bpy.ops.brush:
+.. _bpy.types.UnifiedPaintSettings:
+
+*******
+Brush Editing
+*******
+
+.. reference::
+
+   :Mode:      Sculpt Mode
+   :Panel:     :menuselection:`Sidebar --> Tools --> Brushes`
+
+For painting/sculpting modes each brush type is exposed as a tool in the toolbar.
+The brush on the other hand is a saved preset of all the brush settings, including a name and thumbnail.
+
+All these settings can be found and changed here in the tool setting (brush, texture, stroke, falloff & cursor).
+
+.. figure:: /images/sculpt-paint_brush_brush_data-block-menu.png
+   :align: right
+
+   Brush panel in the tool settings.
+
+Brushes
+   Clicking on the brush thumbnail will open the :ref:`ui-data-block` to select a brush.
+
+   Add Brush (Duplicate icon)
+      When you add a brush, the new brush is a duplicate of the current one.
+   Fake User (Shield icon)
+      Enabling this button will ensure that the brush will not be deleted,
+      even if it is not used by any tool.
+   Unlink Data-Block (Cross icon)
+      Unassign the brush from the active tool.
+      Hold :kbd:`Shift` to remove the brush from all users,
+      so it will be deleted upon reloading the file or purging orphan data.
+
+   Brush Specials (Arrow button)
+      Enabled Modes
+         Enable the brush to be used in different (even multiple) modes.
+         For example, the exact same brushes are used in both Weight Paint
+         and Vertex Paint mode.
+      Tool Selection
+         Transfer the brush preset to be used by a different brush type.
+      Reset Brush
+         Reset all brush settings to the default values of the current brush type.
+
+.. _bpy.types.Brush.use_custom_icon:
+.. _bpy.types.Brush.icon_filepath:
+
+   Custom Icon
+      Define a custom brush thumbnail from an image file.
+

manual/sculpt_paint/sculpting/tool_settings/index.rst

@@ -6,7 +6,7 @@
 .. toctree::
    :maxdepth: 2
 
-   /sculpt_paint/brush/brush.rst
+   /sculpt_paint/brush/index.rst
    brush_settings.rst
    dyntopo.rst
    remesh.rst

manual/sculpt_paint/texture_paint/tool_settings/index.rst

@@ -7,7 +7,7 @@
    :maxdepth: 2
 
    texture_slots.rst
-   /sculpt_paint/brush/brush.rst
+   /sculpt_paint/brush/index.rst
    brush_settings.rst
    mask.rst
    symmetry.rst

manual/sculpt_paint/vertex_paint/tool_settings/index.rst

@@ -6,6 +6,6 @@
 .. toctree::
    :maxdepth: 2
 
-   /sculpt_paint/brush/brush.rst
+   /sculpt_paint/brush/index.rst
    brush_settings.rst
    symmetry.rst

manual/sculpt_paint/weight_paint/tool_settings/index.rst

@@ -6,7 +6,7 @@
 .. toctree::
    :maxdepth: 2
 
-   /sculpt_paint/brush/brush.rst
+   /sculpt_paint/brush/index.rst
    brush_settings.rst
    symmetry.rst
    options.rst