[Bf-docboard-svn] bf-manual: [8747] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'

Aaron Carlisle noreply at blender.org
Fri Dec 3 05:01:10 CET 2021 

Revision: 8747
          https://developer.blender.org/rBM8747
Author:   Blendify
Date:     2021-12-03 05:01:10 +0100 (Fri, 03 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst
    trunk/blender_docs/manual/interface/controls/buttons/menus.rst
    trunk/blender_docs/manual/interface/controls/nodes/editing.rst
    trunk/blender_docs/manual/interface/controls/nodes/frame.rst
    trunk/blender_docs/manual/interface/controls/nodes/groups.rst
    trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst
    trunk/blender_docs/manual/interface/controls/templates/curve.rst
    trunk/blender_docs/manual/interface/controls/templates/list_view.rst
    trunk/blender_docs/manual/interface/controls/templates/operator_search.rst
    trunk/blender_docs/manual/interface/window_system/regions.rst
    trunk/blender_docs/manual/interface/window_system/tabs_panels.rst
    trunk/blender_docs/manual/interface/window_system/workspaces.rst
    trunk/blender_docs/manual/video_editing/sequencer/selecting.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs	2021-12-03 04:01:10 UTC (rev 8747)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,3 ##
 build
 locale
+monostyle
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /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-8740
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8746
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst
===================================================================
--- trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/animation/armatures/posing/editing/in_betweens.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -98,3 +98,18 @@
 - :kbd:`B`: Bendy bones
 - :kbd:`C`: custom properties
 - :kbd:`X`, :kbd:`Y`, :kbd:`Z`: to the corresponding axes
+
+
+.. _bpy.ops.pose.blend_to_neighbour:
+
+Blend to Neighbor
+=================
+
+.. reference::
+
+   :Mode:      Pose Mode
+   :Menu:      :menuselection:`Pose --> In-Betweens --> Blend to Neighbor`
+   :Shortcut:  :kbd:`Shift-Alt-E`
+
+Transitions the current pose with the neighbouring keyframes in the timeline.
+In order for this operator to work, there must be a keyframe before and after the current frame.

Modified: trunk/blender_docs/manual/interface/controls/buttons/menus.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/buttons/menus.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/buttons/menus.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -4,7 +4,7 @@
 Menus
 *****
 
-Blender uses a variety of different menus for accessing options and tools.
+Blender uses a variety of different menus for accessing options and operators.
 Selecting menus can be interacted with in the following ways:
 
 Mouse selection
@@ -43,7 +43,7 @@
    Image menu in the Header of the Image editor.
 
 Most :ref:`headers <ui-region-header>` exhibit a set of menus, located at the start of the header.
-Header menus are used to configure the editor and access tools.
+Header menus are used to configure the editor and access operators.
 All menu entries show the relevant shortcut keys, if any.
 
 

Modified: trunk/blender_docs/manual/interface/controls/nodes/editing.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/editing.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/nodes/editing.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -216,7 +216,7 @@
 Layers
 ======
 
-.. note:: The tools are only used in the :doc:`Compositor </compositing/index>`.
+.. note:: These operators are only used in the :doc:`Compositor </compositing/index>`.
 
 Read Render Layers :kbd:`Ctrl-R`
    Reads all the current scene's render layers from cache, as needed.

Modified: trunk/blender_docs/manual/interface/controls/nodes/frame.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/frame.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/nodes/frame.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -4,7 +4,7 @@
 Frame Node
 **********
 
-The Frame node is a useful tool for organizing nodes by collecting related nodes together in a common area.
+The Frame node is useful for organizing nodes by collecting related nodes together in a common area.
 Frames are useful when a node setup becomes large and confusing yet the re-usability of a Node Group is not required.
 
 .. figure:: /images/interface_controls_nodes_frame_example.png

Modified: trunk/blender_docs/manual/interface/controls/nodes/groups.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/groups.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/nodes/groups.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -176,7 +176,7 @@
    :Menu:      :menuselection:`Node --> Ungroup`
    :Shortcut:  :kbd:`Ctrl-Alt-G`
 
-The :kbd:`Ctrl-Alt-G` tool removes the group and places the individual nodes into your editor workspace.
+Removes the group and places the individual nodes into your editor workspace.
 No internal connections are lost, and now you can link internal nodes to other nodes in your workspace.
 
 Separate :kbd:`P`

Modified: trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -22,8 +22,10 @@
    Clicking on this button will add a stop to your color ramp.
    The stops are added from the last selected stop to the next one, from left to right and
    they will be placed in the middle of both stops.
+
 Delete ``-``
    Deletes the selected color stop from the list.
+
 Specials ``v``
    Contains more operators for the color ramp.
 
@@ -38,49 +40,54 @@
       An :ref:`ui-eyedropper` to sample a color or gradient from the interface to be used in the color ramp.
    Reset Color Ramp
       Resets the color ramp to its default state.
+
+.. _bpy.types.ColorRamp.color_mode:
+
 Color Mode
    Selection of the :term:`Color Space` used for interpolation.
 
-   RGB
+   :RGB:
       Blends color by mixing each color channel and combining.
-   HSV/HSL
+   :HSV/HSL:
       Blends colors by first converting to HSV or HSL, mixing, then combining again.
       This has the advantage of maintaining saturation between different hues,
       where RGB would de-saturate, this allows for a richer gradient.
-Interpolation Options
+
+.. _bpy.types.ColorRamp.hue_interpolation:
+.. _bpy.types.ColorRamp.interpolation:
+
+Color Interpolation
    Enables the user to choose the types of calculations for the color interpolation for each color stop.
 
    RGB
-      B-Spline
-         Uses a *B-Spline* Interpolation for the color stops.
-      Cardinal
-         Uses a *Cardinal* Interpolation for the color stops.
-      Linear
-         Uses a *Linear* Interpolation for the color stops.
-      Ease
-         Uses an *Ease* Interpolation for the color stops.
-      Constant
-         Uses a *Constant* Interpolation for the color stops.
-   HSV and HSL
-      Clockwise
-         Clockwise interpolation around the HSV/HSL wheel.
-      Counter-Clockwise
-         Counterclockwise around the HSV/HSL wheel.
-      Near
-         Nearest route around the wheel.
-      Far
-         Furthest route around the wheel.
+      :B-Spline: Uses a *B-Spline* Interpolation for the color stops.
+      :Cardinal: Uses a *Cardinal* Interpolation for the color stops.
+      :Linear: Uses a *Linear* Interpolation for the color stops.
+      :Ease: Uses an *Ease* Interpolation for the color stops.
+      :Constant: Uses a *Constant* Interpolation for the color stops.
+   
+   HSV/HSL
+      :Clockwise: Clockwise interpolation around the HSV/HSL wheel.
+      :Counter-Clockwise: Counterclockwise around the HSV/HSL wheel.
+      :Near: Nearest route around the wheel.
+      :Far: Furthest route around the wheel.
 
-   .. figure:: /images/interface_controls_templates_color-ramp_interpolation.png
-      :width: 600px
+      .. figure:: /images/interface_controls_templates_color-ramp_interpolation.png
+         :width: 600px
 
-      HSV and HSL interpolation options.
+         HSV and HSL interpolation options.
 
 Active Color Stop
    Index of the active color stop (shown as a dashed line).
    Allows you to change the active color when colors may be too close to easily select with the cursor.
+
+.. _bpy.types.ColorRampElement.position:
+
 Position
    This slider controls the positioning of the selected color stop in the range.
+
+.. _bpy.types.ColorRampElement.color:
+
 Color
    Opens a color picker for the user to specify color and Alpha for the selected color stop.
    When a color is using Alpha, the color field is then divided in two, with the left side

Modified: trunk/blender_docs/manual/interface/controls/templates/curve.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/curve.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/templates/curve.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -45,7 +45,7 @@
    You cannot zoom out further than the clipping region (see *Clipping* below).
 
 Specials ``v``
-   A :ref:`Specials <ui-specials-menu>` menu with tools to operate on control points or to set properties.
+   A :ref:`Specials <ui-specials-menu>` menu with operators to edit control points or to set properties.
 
    Reset View
       Resets the view of the curve.

Modified: trunk/blender_docs/manual/interface/controls/templates/list_view.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/list_view.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/templates/list_view.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -43,6 +43,6 @@
 Remove ``-``
    Removes the selected item.
 Specials ``v``
-   A :ref:`Specials <ui-specials-menu>` menu with tools to operate on list entries.
+   A :ref:`Specials <ui-specials-menu>` menu with operators to edit list entries.
 Move (up/down arrow icon)
    Moves the selected item up/down one position.

Modified: trunk/blender_docs/manual/interface/controls/templates/operator_search.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/operator_search.rst	2021-12-03 03:57:19 UTC (rev 8746)
+++ trunk/blender_docs/manual/interface/controls/templates/operator_search.rst	2021-12-03 04:01:10 UTC (rev 8747)
@@ -15,11 +15,11 @@
    :Menu:      :menuselection:`Edit --> Menu Search`

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list