[Bf-docboard-svn] bf-manual: [8979] trunk/blender_docs/manual/grease_pencil/properties/layers.rst: Merge branch 'blender-3.1-release'

[Aaron Carlisle]

Revision: 8979
          https://developer.blender.org/rBM8979
Author:   Blendify
Date:     2022-02-16 21:05:13 +0100 (Wed, 16 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst
    trunk/blender_docs/manual/grease_pencil/properties/layers.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-02-16 20:04:10 UTC (rev 8978)
+++ trunk/blender_docs	2022-02-16 20:05:13 UTC (rev 8979)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/blender-2.92-release/blender_docs:7610-7921
 /branches/blender-2.93-release/blender_docs:7959-8113
 /branches/blender-3.0-release/blender_docs:8543-8943
-/branches/blender-3.1-release/blender_docs:8904-8974
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-8978
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst	2022-02-16 20:04:10 UTC (rev 8978)
+++ trunk/blender_docs/manual/editors/graph_editor/fcurves/editing.rst	2022-02-16 20:05:13 UTC (rev 8979)
@@ -65,6 +65,22 @@
 
              After Flatten Handles.
 
+.. _bpy.ops.graph.equalize_handles:
+
+Equalize Handles
+   Ensure selected keyframes' handles have equal length.
+
+   Side
+      Side of the keyframes' Bézier handles to affect
+
+      :Left: Equalize selected keyframes' left handles.
+      :Right: Equalize selected keyframes' right handles.
+      :Both: Equalize both of a keyframe's handles.
+   Handle Length
+      Length to make selected keyframes' Bézier handles.
+   Flatten
+      Make the values of the selected keyframes' handles the same as their respective keyframes.
+
 Cursor to Selected :kbd:`Ctrl-G`
    Places the cursor at the midpoint between selected keyframes.
 
@@ -304,8 +320,8 @@
       which controls how much the new decimated curve is allowed to deviate from the original.
 
 
-Slider Operations
-=================
+Slider Operators
+================
 
 .. _bpy.ops.graph.breakdown:
 
@@ -314,7 +330,7 @@
 
 .. reference::
 
-   :Menu:      :menuselection:`Key --> Slider Operations --> Breakdown`
+   :Menu:      :menuselection:`Key --> Slider Operators --> Breakdown`
 
 Moves the selected keyframes to an in between position relative to the adjacent keyframes.
 Drag the mouse left or right to adjust the operator's *Factor* property.
@@ -324,6 +340,24 @@
    values greater than 0.5 favor the right keyframe, a value of 0.5 results in no change.
 
 
+.. _bpy.ops.graph.blend_to_neighbor:
+
+Blend to Neighbor
+-----------------
+
+.. reference::
+
+   :Menu:      :menuselection:`Key --> Slider Operators --> Blend to Neighbor`
+
+Transitions the current keyframe with the neighboring keyframes in the timeline.
+In order for this operator to work, there must be a keyframe before and after the current frame.
+Drag the mouse left or right to adjust the operator's *Blend* property.
+
+Blend
+   The amount to favor either the left or the right key. Values less than 0.5 favor the left keyframe,
+   values greater than 0.5 favor the right keyframe, a value of 0.5 results in no change.
+
+
 .. _bpy.ops.graph.clean:
 
 Clean Keyframes

Modified: trunk/blender_docs/manual/grease_pencil/properties/layers.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/properties/layers.rst	2022-02-16 20:04:10 UTC (rev 8978)
+++ trunk/blender_docs/manual/grease_pencil/properties/layers.rst	2022-02-16 20:05:13 UTC (rev 8979)
@@ -95,8 +95,13 @@
       Avoids editing locked materials in the layer. When disabled,
       any material can be edited even if they are locked in the material list.
 
+   .. _bpy.ops.gpencil.layer_merge:
+
    Merge Down :kbd:`Shift-Ctrl-M`
-      Merge the selected layer with the layer below, the new layer keeps the name of the lower layer.
+      Combine the selected layer with the layer below, the new layer keeps the name of the lower layer.
+   
+   Merge All
+      Combine all layers into the active layer.
 
    Copy Layer to Selected
       Copy the active layer to the selected Grease Pencil object.