[Bf-docboard-svn] bf-manual: [9270] trunk/blender_docs/manual/sculpt_paint/sculpting/tools/index.rst: Merge branch 'blender-3.2-release'

[Aaron Carlisle]

Revision: 9270
          https://developer.blender.org/rBM9270
Author:   Blendify
Date:     2022-05-11 00:32:20 +0200 (Wed, 11 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/tools/index.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-10 22:29:34 UTC (rev 9269)
+++ trunk/blender_docs	2022-05-10 22:32:20 UTC (rev 9270)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/blender-2.93-release/blender_docs:7959-8113
 /branches/blender-3.0-release/blender_docs:8543-9034
 /branches/blender-3.1-release/blender_docs:8904-9230
-/branches/blender-3.2-release/blender_docs:9236-9267
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9269
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst	2022-05-10 22:29:34 UTC (rev 9269)
+++ trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst	2022-05-10 22:32:20 UTC (rev 9270)
@@ -35,7 +35,7 @@
 Color
    Object color, same as *Color* in the :menuselection:`Properties --> Object Properties --> Viewport Display`.
 Alpha
-   The :term:`Alpha` component of the object's viewport display color (see the *Color* output for more details).
+   The :term:`Alpha Channel` component of the object's viewport display color (see the *Color* output for more details).
 Object Index
    Object pass index, same as *Pass Index*
    in the :menuselection:`Properties --> Object Properties --> Relations`.

Modified: trunk/blender_docs/manual/sculpt_paint/sculpting/tools/index.rst
===================================================================
--- trunk/blender_docs/manual/sculpt_paint/sculpting/tools/index.rst	2022-05-10 22:29:34 UTC (rev 9269)
+++ trunk/blender_docs/manual/sculpt_paint/sculpting/tools/index.rst	2022-05-10 22:32:20 UTC (rev 9270)
@@ -48,6 +48,7 @@
    line_project.rst
    mesh_filter.rst
    cloth_filter.rst
+   color_filter.rst
    edit_face_set.rst
    mask_by_color.rst
    transforms.rst