[Bf-docboard-svn] bf-manual: [9485] trunk/blender_docs/manual/editors/dope_sheet/shape_key.rst: Merge branch 'blender-3.3-release'

Aaron Carlisle noreply at blender.org
Tue Aug 16 04:20:14 CEST 2022


Revision: 9485
          https://developer.blender.org/rBM9485
Author:   Blendify
Date:     2022-08-16 04:20:14 +0200 (Tue, 16 Aug 2022)
Log Message:
-----------
Merge branch 'blender-3.3-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/animation/shape_keys/shape_keys_panel.rst
    trunk/blender_docs/manual/editors/dope_sheet/shape_key.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-08-16 02:20:00 UTC (rev 9484)
+++ trunk/blender_docs	2022-08-16 02:20:14 UTC (rev 9485)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -3,4 +3,4 ##
 /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-9417
-/branches/blender-3.3-release/blender_docs:9438-9478
\ No newline at end of property
+/branches/blender-3.3-release/blender_docs:9438-9484
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/shape_keys/shape_keys_panel.rst
===================================================================
--- trunk/blender_docs/manual/animation/shape_keys/shape_keys_panel.rst	2022-08-16 02:20:00 UTC (rev 9484)
+++ trunk/blender_docs/manual/animation/shape_keys/shape_keys_panel.rst	2022-08-16 02:20:14 UTC (rev 9485)
@@ -3,27 +3,32 @@
 Shape Keys Panel
 ****************
 
+.. reference::
+
+   :Editor:    Properties
+   :Mode:      All modes
+   :Panel:     :menuselection:`Object Data --> Shape Keys`
+
 .. figure:: /images/animation_shape-keys_shape-keys-panel_basis.png
    :align: right
 
    Shape Keys panel.
 
-.. reference::
 
-   :Editor:    Properties
-   :Mode:      All modes
-   :Panel:     :menuselection:`Object Data --> Shape Keys`
-
 The Shape Keys panel is used for authoring shape keys.
 
+.. container:: lead
 
-Settings
-========
+   .. clear
 
+.. _bpy.types.Object.active_shape_key_index:
+
 Active Shape Key Index
    A :ref:`List View <ui-list-view>`.
 
-   Value (number)
+   .. _bpy.types.ShapeKey.frame:
+
+   Value/Frame (number)
       In Relative mode: Value is the current influence of the shape key used for blending between
       the shape (value=1.0) and its reference key (value=0.0). The reference key is usually the Basis shape.
       The weight of the blend can be extrapolated above 1.0 and below 0.0.
@@ -30,44 +35,72 @@
 
       In Absolute mode: Value is the *Evaluation Time* at which the shape will have maximum influence.
 
+   .. _bpy.types.ShapeKey.mute:
+
    Mute (check mark)
       If unchecked, the shape key will not be taken into consideration when
       mixing the shape key stack into the result visible in the 3D Viewport.
 
-   Specials
-      New Shape from Mix
-         Add a new shape key with the current deformed shape of the object.
-         This differs from the ``+`` button of the list, as that one always copies
-         the Basis shape independently of the current mix.
-      Mirror Shape Key
-         If your mesh is symmetrical, in *Object Mode*, you can mirror the shape keys on the X axis.
-         This will not work unless the mesh vertices are perfectly symmetrical.
-         Use the :menuselection:`Mesh --> Symmetrize` tool in *Edit Mode*.
-      Mirror Shape Key (Topology)
-         Same as *Mirror Shape Key* though it detects the mirrored vertices based on the topology of the mesh.
-         The mesh vertices do not have to be perfectly symmetrical for this action to work.
-      Join as Shapes (Transfer Mix)
-         Transfer the current resulting shape from a different object.
+Shape Key Specials
+   .. _bpy.ops.object.shape_key_add:
 
-         Select the object to copy, then the object to copy into.
-         Use this action and a new shape key will be added to the active object
-         with the current mix of the first object.
+   New Shape from Mix
+      Add a new shape key with the current deformed shape of the object.
+      This differs from the ``+`` button of the list, as that one always copies
+      the Basis shape independently of the current mix.
 
-      Transfer Shape Key
-         Transfer the active shape key from a different object
-         regardless of its current influence.
+   .. _bpy.ops.object.shape_key_mirror:
 
-         Select the object to copy, then the object to copy into.
-         Use this action and a new shape key will be added to the active object
-         with the active shape of the first object.
+   Mirror Shape Key
+      If your mesh is symmetrical, in *Object Mode*, you can mirror the shape keys on the X axis.
+      This will not work unless the mesh vertices are perfectly symmetrical.
+      Use the :menuselection:`Mesh --> Symmetrize` tool in *Edit Mode*.
 
+   Mirror Shape Key (Topology)
+      Same as *Mirror Shape Key* though it detects the mirrored vertices based on the topology of the mesh.
+      The mesh vertices do not have to be perfectly symmetrical for this action to work.
+
+   .. _bpy.ops.object.join_shapes:
+
+   Join as Shapes (Transfer Mix)
+      Transfer the current resulting shape from a different object.
+
+      Select the object to copy, then the object to copy into.
+      Use this action and a new shape key will be added to the active object
+      with the current mix of the first object.
+
+   .. _bpy.ops.object.shape_key_transfer:
+
+   Transfer Shape Key
+      Transfer the active shape key from a different object
+      regardless of its current influence.
+
+      Select the object to copy, then the object to copy into.
+      Use this action and a new shape key will be added to the active object
+      with the active shape of the first object.
+
+   .. _bpy.ops.object.shape_key_remove:
+
+   Delete All Shape Keys
+      Removes all Shape Keys and any effect that they had on the mesh.
+
+   Apply All Shape Keys
+      Saves the current visible shape to the mesh data and deletes all Shape Keys.
+
+.. _bpy.types.Key.use_relative:
+
 Relative
    Set the shape keys to *Relative* or *Absolute*.
    See :ref:`animation-shapekeys-relative-vs-absolute`.
 
+.. _bpy.types.Object.show_only_shape_key:
+
 Shape Key Lock (pin icon)
    Show the active shape in the 3D Viewport without blending.
    *Shape Key Lock* gets automatically enabled while the object is in *Edit Mode*.
+
+.. _bpy.types.Object.use_shape_key_edit_mode:
+
 Shape Key Edit Mode (edit mode icon)
    If enabled, when entering *Edit Mode* the active shape key will **not** take maximum influence as is default.
    Instead, the current blend of shape keys will be visible and can be edited from that state.
@@ -74,53 +107,80 @@
 
 
 Relative Shape Keys
--------------------
+===================
 
+.. figure:: /images/animation_shape-keys_shape-keys-panel_relative.png
+   :align: right
+
+   Relative Shape Keys options.
+
 See :ref:`animation-shapekeys-relative-vs-absolute`.
 
 With absolute shape keys, the value shown for each shape in the list represents
 the current weight or influence of that shape in the current *Mix*.
 
-.. figure:: /images/animation_shape-keys_shape-keys-panel_relative.png
+.. container:: lead
 
-   Relative Shape Keys options.
+   .. clear
 
+.. _bpy.ops.object.shape_key_clear:
+
 Clear Shape Keys ``X``
    Set all influence values, or weights, to zero.
    Useful to quickly guarantee that the result shown in the 3D Viewport is not affected by shapes.
 
-.. _animation-shapekey-relative-value:
+.. _bpy.types.ShapeKey.value:
 
 Value
    The weight of the blend between the shape key and its reference key (usually the Basis shape).
 
    A value of 0.0 denotes 100% influence of the reference key and 1.0 of the shape key.
+
+.. _bpy.types.ShapeKey.slider_min:
+.. _bpy.types.ShapeKey.slider_max:
+
 Range
    Minimum and maximum range for the influence value of the active shape key.
    Blender can extrapolate results when the *Value* goes lower than 0.0 or above 1.0.
+
+.. _bpy.types.ShapeKey.vertex_group:
+
 Vertex Group
    Limit the active shape key deformation to a vertex group.
    Useful to break down a complex shape into components by assigning temporary vertex groups
    to the complex shape and copying the result into new simpler shapes.
+
+.. _bpy.types.ShapeKey.relative_key:
+
 Relative To
    Select the shape key to deform from. This is called the *Reference Key* for that shape.
 
 
 Absolute Shape Keys
--------------------
+===================
 
+.. figure:: /images/animation_shape-keys_shape-keys-panel_absolute.png
+   :align: right
+
+   Absolute Shape Keys options.
+
 See :ref:`animation-shapekeys-relative-vs-absolute`.
 
 With absolute shape keys, the value shown for each shape in the list represents
 the *Evaluation Time* at which that shape key will be active.
 
-.. figure:: /images/animation_shape-keys_shape-keys-panel_absolute.png
+.. container:: lead
 
-   Absolute Shape Keys options.
+   .. clear
 
+.. _bpy.ops.object.shape_key_retime:
+
 Re-Time Shape Keys (clock icon)
    Absolute shape keys are timed, by order in the list, at a constant interval.
    This button resets the timing for the keys. Useful if keys were removed or re-ordered.
+
+.. _bpy.types.ShapeKey.interpolation:
+
 Interpolation
    Controls the interpolation between shape keys.
 
@@ -134,6 +194,8 @@
 
       The red line represents interpolated values between keys (black dots).
 
+.. _bpy.types.Key.eval_time:
+
 Evaluation Time
    Controls the shape key influence. Scrub to see the effect of the current configuration.
    Typically, this property is keyed for animation or rigged with a driver.

Modified: trunk/blender_docs/manual/editors/dope_sheet/shape_key.rst
===================================================================
--- trunk/blender_docs/manual/editors/dope_sheet/shape_key.rst	2022-08-16 02:20:00 UTC (rev 9484)
+++ trunk/blender_docs/manual/editors/dope_sheet/shape_key.rst	2022-08-16 02:20:14 UTC (rev 9485)
@@ -10,7 +10,7 @@
 ================
 
 The *Shape Key Editor* is used to adjust the animation timing of :doc:`shape keys </animation/shape_keys/index>`.
-These are stored inside an Action data-block. It lets you edit the :ref:`value <animation-shapekey-relative-value>`
+These are stored inside an Action data-block. It lets you edit the :ref:`Value <bpy.types.ShapeKey.value>`
 of shape keys over time.
 
 This mode of the *Dope Sheet* uses a similar interface as the :doc:`/editors/dope_sheet/action` Mode



More information about the Bf-docboard-svn mailing list