manual/editors/3dview/display/overlays.rst

@@ -410,50 +410,103 @@ Grease Pencil
 
 These overlays are available when a :doc:`/grease_pencil/index` object is selected.
 
+.. _bpy.types.View3DOverlay.use_gpencil_onion_skin:
+
 Onion Skin
    Show ghosts of the keyframes before and after the current frame.
    If :doc:`Multiframe </grease_pencil/multiframe>` is enabled,
    ghosts of the selected keyframes are shown instead.
    See :doc:`/grease_pencil/properties/onion_skinning`.
-Canvas
-   Display a grid over the Grease Pencil drawing plane.
-   The opacity of the grid can be controlled with the slider.
-   When using the *Canvas X-Ray* option, objects are drawn behind the canvas grid.
+
+.. _bpy.types.View3DOverlay.use_gpencil_fade_layers:
+.. _bpy.types.View3DOverlay.gpencil_fade_layer:
+
 Fade Inactive Layers
    Decrease the opacity of all the layers in the object other than the active one.
    The opacity factor can be controlled with the slider.
+
+.. _bpy.types.View3DOverlay.use_gpencil_fade_objects:
+.. _bpy.types.View3DOverlay.gpencil_fade_objects:
+
 Fade Inactive Objects
    Cover all of the viewport except the active Grease Pencil object with a full color layer to improve visibility
    while drawing over complex scenes.
 
+   .. _bpy.types.View3DOverlay.use_gpencil_fade_gp_objects:
+
    Fade Grease Pencil Objects
       Include or exclude Grease Pencil objects.
 
-Edit Lines
-   Show edit lines in Edit Mode.
+.. _bpy.types.View3DOverlay.use_gpencil_edit_lines:
+
+Edit Lines :guilabel:`Edit, Sculpt, Weight Paint, or Vertex Paint Modes`
+   Shows a line between points on top of other geometry when editing strokes.
+
+.. _bpy.types.View3DOverlay.use_gpencil_multiedit_line_only:
+
 Only in Multiframe
    When Multiframe is enabled and keyframes other than the current frame are selected,
    strokes on those keyframes are displayed as just their edit lines -- the strokes themselves are hidden.
    Note that this does not affect Onion Skinning.
-Stroke Direction
+
+.. _bpy.types.View3DOverlay.use_gpencil_show_directions:
+
+Stroke Direction :guilabel:`Edit`
    Toggle the display of the selected strokes' start points (green) and end points (red) to visualize their direction.
-Material Name
+
+.. _bpy.types.View3DOverlay.use_gpencil_show_material_name:
+
+Material Name :guilabel:`Edit`
    Show material name next to the selected strokes.
-Vertex Opacity
-   Opacity for vertices (points) and edit lines in Edit and Sculpt Mode.
-Vertex Paint Opacity
+
+.. rubric:: Vertex Paint
+
+.. Vertex Opacity :guilabel:`Vertex Paint`
+..    Opacity for vertices (points) and edit lines in Edit and Sculpt Mode.
+
+.. _bpy.types.View3DOverlay.gpencil_vertex_paint_opacity:
+
+Vertex Paint Opacity :guilabel:`Vertex Paint`
    The opacity of the vertex color overlay in Vertex Paint Mode and Draw Mode.
    Note that in Draw Mode, vertex paint is only visible in the *Material Preview*
    and *Rendered* shading modes by default. To see it in *Solid* mode, you either
    need to use Vertex Paint Mode, or set the :doc:`Color </render/workbench/color>`
    shading setting to *Attribute*.
 
-.. _bpy.types.View3DOverlay.display_handle:
 
-Handles
-   When :doc:`Curve Editing </grease_pencil/modes/edit/curve_editing>` is active,
-   this option controls how curves are displayed in the 3D Viewport.
+.. _bpy.types.View3DOverlay.use_gpencil_grid:
 
-   :None: No handles are displayed, only the control points.
-   :Selected: Only handles for selected control points are displayed.
-   :All: All the handles are displayed.
+Canvas
+------
+
+Display a grid over the Grease Pencil drawing plane.
+
+.. _bpy.types.View3DOverlay.gpencil_grid_opacity:
+
+Canvas Grid Opacity
+   The opacity of the grid.
+
+.. _bpy.types.View3DOverlay.use_gpencil_canvas_xray:
+
+Canvas X-Ray
+   Objects are drawn behind the canvas grid.
+
+.. _bpy.types.View3DOverlay.gpencil_grid_subdivisions:
+
+Subdivisions
+   The number of subdivisions between grid lines.
+
+.. _bpy.types.View3DOverlay.gpencil_grid_color:
+
+Grid Color
+   The color of the grid lines.
+
+.. _bpy.types.View3DOverlay.gpencil_grid_scale:
+
+Scale X/Y
+   The horizontal/vertical size of the grid.
+
+.. _bpy.types.View3DOverlay.gpencil_grid_offset:
+
+Offset X/Y
+   The amount to shift the grid up/down and left/right.

manual/editors/preferences/interface.rst

@@ -97,9 +97,33 @@ Navigation Controls
 .. _bpy.types.PreferencesView.color_picker_type:
 
 Color Picker Type
-   Choose which type of :term:`Color Space` you prefer. It will show when clicking :kbd:`LMB` on any color field.
+   Choose which type of :term:`Color Space` you prefer for the
+   :doc:`Color picker </interface/controls/templates/color_picker>`.
+   It will show when clicking :kbd:`LMB` on any color field.
 
-   See the different color picker types at the :doc:`Color picker </interface/controls/templates/color_picker>` page.
+   .. list-table:: Color Picker types.
+
+      * - .. figure:: /images/interface_controls_templates_color-picker_circle-hsv.png
+
+             Circle HSV.
+
+        - .. figure:: /images/interface_controls_templates_color-picker_circle-hsl.png
+
+             Circle HSL.
+
+        - ..
+
+      * - .. figure:: /images/interface_controls_templates_color-picker_square-sv-h.png
+
+             Square (SV + H).
+
+        - .. figure:: /images/interface_controls_templates_color-picker_square-hs-v.png
+
+             Square (HS + V).
+
+        - .. figure:: /images/interface_controls_templates_color-picker_square-hv-s.png
+
+             Square (HV + S).
 
 .. _bpy.types.PreferencesView.header_align:
 

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

@@ -284,6 +284,6 @@ Switching to the Erase Tool
 ---------------------------
 
 :kbd:`Ctrl-LMB` changes temporally to the active Erase tool.
-See :doc:`Erase Tool </grease_pencil/modes/draw/tool/erase>` for more information.
+See :doc:`Erase Tool </grease_pencil/modes/draw/tools/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/editing.rst

@@ -0,0 +1,37 @@
+******************
+Drawing Operations
+******************
+
+Active Layer
+============
+
+.. reference::
+
+   :Mode:      Draw Mode
+   :Menu:      :menuselection:`Draw --> Active Layer`
+   :Shortcut:  :kbd:`Y`
+
+Select the active layer.
+
+
+Animation
+=========
+
+.. reference::
+
+   :Mode:      Draw Mode
+   :Menu:      :menuselection:`Draw --> Animation`
+   :Shortcut:  :kbd:`I`
+
+The stroke animation operations are described in the :doc:`Animation </grease_pencil/animation/tools>` section.
+
+
+Interpolate Sequence
+====================
+
+.. reference::
+
+   :Mode:      Draw Mode
+   :Menu:      :menuselection:`Draw --> Interpolate Sequence`
+
+See :ref:`bpy.ops.grease_pencil.interpolate_sequence`.

manual/grease_pencil/modes/draw/index.rst

@@ -13,3 +13,4 @@
    tool_settings/index.rst
    stroke_placement.rst
    drawing_planes.rst
+   editing.rst

manual/grease_pencil/modes/draw/introduction.rst

@@ -10,10 +10,6 @@ Already made strokes can not be selected in Draw Mode, for editing strokes you m
 the :doc:`Edit Mode </grease_pencil/modes/edit/introduction>` or
 :doc:`Sculpt Mode </grease_pencil/modes/sculpting/introduction>`.
 
-
-Draw Mode
-=========
-
 .. figure:: /images/grease-pencil_modes_draw_introduction_mode-selector.png
 
    3D Viewport Mode selector: Draw Mode.
@@ -31,8 +27,8 @@ There are also some tools to create primitives shapes like lines, arcs, curves,
 See :doc:`Toolbar </grease_pencil/modes/draw/tools>` for more details.
 
 
-Strokes Location and Orientation Controls
-=========================================
+Strokes Location & Orientation Controls
+=======================================
 
 Drawing in a 3D space is not the same as drawing on a flat canvas.
 When drawing with Grease Pencil you have to define
@@ -59,8 +55,6 @@ The Drawing Planes selector defines the plane (orientation) to which the new str
 See :doc:`Drawing Planes </grease_pencil/modes/draw/drawing_planes>` for more information.
 
 
-.. _bpy.types.ToolSettings.use_gpencil_draw_additive:
-
 Drawing Options
 ===============
 
@@ -68,10 +62,22 @@ Drawing Options
 
    General drawing options.
 
-Draw on Back
-   When enabled, new strokes are drawn below of all strokes in the layer.
-   For example when you want to paint with a fill material below line strokes on a character and
-   they are on the same layer.
+Multiframe
+   Allows to draw on several frames at the same time.
+
+   See :doc:`Multiframe </grease_pencil/multiframe>` for more information.
+
+.. _bpy.types.ToolSettings.use_gpencil_draw_additive:
+
+Additive Drawing
+   When creating new frames adding strokes with drawing tools,
+   the strokes from the previous/active frame are include as a basis for the new one.
+   When erasing existing strokes using Additive Drawing a new keyframe will be added.
+
+.. _bpy.types.ToolSettings.use_gpencil_automerge_strokes:
+
+AutoMerge
+   Joins new strokes with the beginning or end of previously drawn strokes in the active layer.
 
 .. _bpy.types.ToolSettings.use_gpencil_weight_data_add:
 
@@ -86,17 +92,7 @@ Add Weight Data
 
 .. _bpy.types.ToolSettings.use_gpencil_draw_onback:
 
-Additive Drawing
-   When creating new frames adding strokes with drawing tools,
-   the strokes from the previous/active frame are include as a basis for the new one.
-   When erasing existing strokes using Additive Drawing a new keyframe will be added.
-
-.. _bpy.types.ToolSettings.use_gpencil_automerge_strokes:
-
-AutoMerge
-   Joins new strokes with the beginning or end of previously drawn strokes in the active layer.
-
-Multiframe
-   Allows to draw on several frames at the same time.
-
-   See :doc:`Multiframe </grease_pencil/multiframe>` for more information.
+Draw on Back
+   When enabled, new strokes are drawn below of all strokes in the layer.
+   For example when you want to paint with a fill material below line strokes on a character and
+   they are on the same layer.

manual/grease_pencil/modes/edit/grease_pencil_menu.rst

@@ -90,17 +90,27 @@ Active Layer
 Select the active layer.
 
 
-.. Animation
-.. =========
+Animation
+=========
 
-.. .. reference::
+.. reference::
 
-..    :Mode:      Edit Mode, Draw Mode
-..    :Menu:      :menuselection:`Grease Pencil --> Animation`
-..    :Shortcut:  :kbd:`I`
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Grease Pencil --> Animation`
+   :Shortcut:  :kbd:`I`
 
-.. The stroke animation tools are described
-.. in the :doc:`Animation </grease_pencil/animation/tools>` section.
+The stroke animation operations are described in the :doc:`Animation </grease_pencil/animation/tools>` section.
+
+
+Interpolate Sequence
+====================
+
+.. reference::
+
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Grease Pencil --> Interpolate Sequence`
+
+See :ref:`bpy.ops.grease_pencil.interpolate_sequence`.
 
 
 .. _bpy.ops.grease_pencil.duplicate_move:
@@ -167,6 +177,17 @@ Keep World Transform
    Keep the world transform of strokes from the clipboard unchanged.
 
 
+Weights
+=======
+
+.. reference::
+
+   :Mode:      Edit Mode, Draw Mode
+   :Menu:      :menuselection:`Grease Pencil --> Weights`
+
+The stroke weight operations are described in the :doc:`/grease_pencil/modes/weight_paint/weights_menu` section.
+
+
 Show/Hide
 =========
 
@@ -464,14 +485,3 @@ Delete Active Keyframes (All Layers)
    :Shortcut:  :kbd:`Shift-Delete`
 
 Deletes all the strokes at the current frame in all layer.
-
-
-Interpolate Sequence
-====================
-
-.. reference::
-
-   :Mode:      Edit Mode, Draw Mode
-   :Menu:      :menuselection:`Grease Pencil --> Interpolate Sequence`
-
-See :ref:`bpy.ops.grease_pencil.interpolate_sequence`.

manual/grease_pencil/modes/edit/stroke_menu.rst

@@ -104,29 +104,29 @@ Factor
 ..    while larger values will result in fewer points needed to recreate the curve.
 
 
-.. .. _bpy.ops.gpencil.stroke_trim:
+.. _bpy.ops.gpencil.stroke_trim:
 
-.. Trim
-.. ====
+Trim
+====
 
-.. .. reference::
+.. reference::
 
-..    :Mode:      Edit Mode
-..    :Menu:      :menuselection:`Stroke --> Trim`
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Stroke --> Trim`
 
-.. Trims selected stroke to first loop or intersection.
+Trims selected stroke to first loop or intersection.
 
-.. .. list-table::
+.. list-table::
 
-..    * - .. figure:: /images/grease-pencil_modes_edit_stroke-menu_trim-1.png
-..           :width: 320px
+   * - .. figure:: /images/grease-pencil_modes_edit_stroke-menu_trim-1.png
+          :width: 320px
 
-..           Original stroke.
+          Original stroke.
 
-..      - .. figure:: /images/grease-pencil_modes_edit_stroke-menu_trim-2.png
-..           :width: 320px
+     - .. figure:: /images/grease-pencil_modes_edit_stroke-menu_trim-2.png
+          :width: 320px
 
-..           Result of trim operation.
+          Result of trim operation.
 
 
 .. .. _bpy.ops.gpencil.stroke_outline:
@@ -178,28 +178,41 @@ Factor
 ..           Generated stroke after outline operation.
 
 
-.. .. _bpy.ops.gpencil.stroke_join:
+Join
+====
 
-.. Join
-.. ====
+.. _bpy.ops.grease_pencil.join_selection:
 
-.. .. reference::
+Join
+----
 
-..    :Mode:      Edit Mode
-..    :Menu:      :menuselection:`Stroke --> Join --> Join, Join and Copy`
-..    :Shortcut:  :kbd:`Ctrl-J`, :kbd:`Shift-Ctrl-J`
+.. reference::
 
-.. Join two or more strokes into a single one.
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Stroke --> Join --> Join,`
+   :Shortcut:  :kbd:`Ctrl-J`
 
-.. Type
-..    Join :kbd:`Ctrl-J`
-..       Join selected strokes by connecting points.
+Join two or more strokes into a single one.
 
-..    Join and Copy :kbd:`Shift-Ctrl-J`
-..       Join selected strokes by connecting points in a new stroke.
+Type
+   :Join:
+      Join selected strokes by connecting points.
+   :Join and Copy:
+      Join selected strokes by connecting points in a new stroke.
+Leave Gaps
+   When enabled, do not use geometry to connect the strokes.
 
-.. Leave Gaps
-..    When enabled, do not use geometry to connect the strokes.
+
+Join and Copy
+-------------
+
+.. reference::
+
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Stroke --> Join --> Join and Copy`
+   :Shortcut:  :kbd:`Shift-Ctrl-J`
+
+Same as :ref:`bpy.ops.grease_pencil.join_selection` but *Type* defaults to *Join and Copy*.
 
 
 .. _bpy.ops.grease_pencil.move_to_layer:
@@ -483,7 +496,7 @@ Set Curve Resolution
    :Mode:      Edit Mode
    :Menu:      :menuselection:`Stroke --> Set Curve Resolution`
 
-Sets the :ref:`Curve Resolution <bpy.types.GreasePencil.edit_curve_resolution>` value.
+Sets the number of points generated along each curve segment (between two handles).
 
 
 .. _bpy.ops.grease_pencil.reset_uvs:

manual/grease_pencil/modes/weight_paint/weights_menu.rst

@@ -11,21 +11,6 @@ Weights Menu
 This page covers many of the tools in the *Weights* menu.
 
 
-.. _bpy.ops.grease_pencil.weight_sample:
-
-Sample Weight
-=============
-
-.. reference::
-
-   :Mode:      Edit Mode
-   :Menu:      :menuselection:`Weights --> Sample Weight`
-   :Shortcut:  :kbd:`Shift-X`
-
-Adjust the Weight of the :doc:`Draw </grease_pencil/modes/weight_paint/tools>`
-tool to the weight of the vertex under the mouse cursor.
-
-
 .. _bpy.ops.grease_pencil.vertex_group_normalize_all:
 
 Normalize All
@@ -60,13 +45,13 @@ such that the highest weight value is 1.0.
 
 .. _bpy.ops.grease_pencil.weight_invert:
 
-Invert Weight
-=============
+Invert
+======
 
 .. reference::
 
    :Mode:      Edit Mode
-   :Menu:      :menuselection:`Weights --> Invert Weight`
+   :Menu:      :menuselection:`Weights --> Invert`
 
 Replaces each weight of the selected vertex group by × -1.0 weight.
 
@@ -77,17 +62,17 @@ Examples:
 - Original 0.0 converts to 1.0
 
 
-.. .. _bpy.ops.gpencil.vertex_group_smooth:
+.. _bpy.ops.grease_pencil.vertex_group_smooth:
 
-.. Smooth
-.. ======
+Smooth
+======
 
-.. .. reference::
+.. reference::
 
-..    :Mode:      Edit Mode
-..    :Menu:      :menuselection:`Weights --> Smooth`
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Weights --> Smooth`
 
-.. Smooths the weights of the active vertex group.
+Smooths the weights of the active vertex group.
 
 
 .. .. _bpy.ops.gpencil.generate_weights:
@@ -111,3 +96,18 @@ Examples:
 ..    It calculates how much influence a particular bone would have on points based on the distance
 ..    from those points to a particular bone ("bone heat" algorithm).
 ..    This influence will be assigned as weights in the vertex groups.
+
+
+.. _bpy.ops.grease_pencil.weight_sample:
+
+Sample Weight
+=============
+
+.. reference::
+
+   :Mode:      Edit Mode
+   :Menu:      :menuselection:`Weights --> Sample Weight`
+   :Shortcut:  :kbd:`Shift-X`
+
+Adjust the Weight of the :doc:`Draw </grease_pencil/modes/weight_paint/tools>`
+tool to the weight of the vertex under the mouse cursor.

manual/grease_pencil/multiframe.rst

@@ -1,16 +1,23 @@
-.. _bpy.types.GreasePencil.use_multiedit:
-.. _bpy.types.GPencilSculptSettings.use_multiframe_falloff:
+.. _bpy.types.ToolSettings.use_grease_pencil_multi_frame_editing:
 
 **********
 Multiframe
 **********
 
+.. figure:: /images/grease-pencil_multiframe_panel.png
+   :align: right
+
+   Multiframe pop-over.
+
+
 Multiframe allows you to draw, edit, sculpt, or weight painting on several frames at the same time.
 Extremely useful to avoid repeating a task one frame at a time when animating.
 
-.. figure:: /images/grease-pencil_multiframe_panel.png
+.. _bpy.types.GPencilSculptSettings.use_multiframe_falloff:
 
-   Multiframe panel.
+Use Falloff
+   When enabled, the effects on the strokes start to falloff from the current frame
+   as defined by a :doc:`curve widget </interface/controls/templates/curve>`.
 
 
 Usage
@@ -28,10 +35,6 @@ Usage
    - When interpolating you can select the stroke from the different frames in the right order.
      Interpolate tool will use the selection order to calculate the correct stroke pairs.
 
-Use Falloff
-   When enabled, the effects on the strokes start to falloff from the current frame
-   as defined by a :doc:`curve widget </interface/controls/templates/curve>`.
-
 .. note::
 
    Not all operators support Multiframe mode.

manual/grease_pencil/properties/data.rst

@@ -32,6 +32,24 @@ Onion skinning is used in animation to see several frames at once and make decis
 edits based on how the previous/next frames are drawn.
 
 
+:doc:`Settings </grease_pencil/properties/strokes>`
+===================================================
+
+General settings for Grease Pencil strokes.
+
+
+.. _bpy.types.AttributeGroupGreasePencil:
+
+Attributes
+==========
+
+An attribute is data stored per curve element. Every attribute has a data type, domain and name.
+This panel only lists custom attributes which excludes all the built-in attributes like ``position`` and
+other attributes like vertex groups.
+
+See :doc:`Attributes Reference </modeling/geometry_nodes/attributes_reference>` for more information.
+
+
 :doc:`Vertex Groups </modeling/meshes/properties/vertex_groups/index>`
 ======================================================================
 

manual/interface/controls/templates/color_picker.rst

@@ -12,17 +12,17 @@ Color Picker
 The color picker is a pop-up that lets you define a color value.
 Holding :kbd:`Ctrl` while dragging snaps the hue to make it quick to select primary colors.
 
-Color Field
+Color Picker
    Lets you pick the first and second color component. The shape can be changed; see `Types`_.
-
-Color Slider
-   The slider with a gradient in the background lets you define the third color component.
-   It can also be controlled with the :kbd:`Wheel`.
-
+Value/Lightness
+   The slider with a gradient in the background defines the value/lightness of the color mixing.
+   Fine control can be inputted with :kbd:`Wheel`.
 Color Model
-   Selects the :term:`Color Model` for the number fields below.
+   Selects the :term:`Color Model` for the number value fields.
 
-   RGB, HSV/HSL, Hex
+   :RGB: Create the final color by mixing red, green, and blue colors.
+   :HSV/HSL:
+      Create the final color by adjusting hue, saturation, and value/lightness.
 
    .. note::
 
@@ -31,29 +31,28 @@ Color Model
       On the contrary, *Hex* are automatically :term:`Gamma` corrected
       for the :term:`sRGB Color Space <Color Space>`.
       For more information, see :doc:`Color Management </render/color_management>`.
-
 Color Values
-   Blender uses values from 0 to 1 to express colors for RGB and HSV colors.
+   Blender uses values from 0 to 1.0 to express the color mixing for RGB and HSV/HSL colors.
 
-   Hexadecimal (Hex) values are expressed as ``RRGGBB``.
-   Shorthand hex colors are also supported as ``RGB``,
-   e.g. dark yellow ``FFCC00`` can be written as ``FC0``.
-
-   For operations that are capable of using the :term:`Alpha Channel`, another slider "A" is added.
+   For color inputs with an :term:`Alpha Channel`, another slider is added.
+Hex
+   The hexadecimal (hex) equivalent value to the mixed color.
+   Shorthand hex colors are can be typed in, e.g. dark yellow ``FFCC00`` can be written as ``FC0``.
 
 .. _bpy.ops.ui.eyedropper_color:
 
 Eyedropper (pipette icon)
    Samples a color from inside the Blender window using the :ref:`ui-eyedropper`.
+   Note, colors sampled from the eyedropper are in linear color space and do not account for view transform adjustments.
 
 
 Shortcuts
 =========
 
-- :kbd:`Ctrl-LMB` (drag) snaps to hue.
+- :kbd:`Ctrl-LMB` (drag) snaps the hue to 30° intervals.
 - :kbd:`Shift-LMB` (drag) precision motion.
-- :kbd:`Wheel` adjust the brightness.
-- :kbd:`Backspace` reset the value.
+- :kbd:`Wheel` adjust the value/lightness.
+- :kbd:`Backspace` reset the value to the default value.
 
 
 Types