[Bf-docboard-svn] bf-manual: [8040] trunk/blender_docs/manual: Merge branch 'blender-2.93-release'
Aaron Carlisle
noreply at blender.org
Mon May 17 21:15:32 CEST 2021
Revision: 8040
https://developer.blender.org/rBM8040
Author: Blendify
Date: 2021-05-17 21:15:32 +0200 (Mon, 17 May 2021)
Log Message:
-----------
Merge branch 'blender-2.93-release'
Modified Paths:
--------------
trunk/blender_docs/manual/animation/armatures/properties/display.rst
trunk/blender_docs/manual/compositing/types/groups.rst
trunk/blender_docs/manual/editors/preferences/addons.rst
trunk/blender_docs/manual/editors/timeline.rst
trunk/blender_docs/manual/interface/controls/nodes/parts.rst
trunk/blender_docs/manual/modeling/meshes/editing/face/face_data.rst
trunk/blender_docs/manual/modeling/meshes/uv/editing.rst
trunk/blender_docs/manual/modeling/modifiers/physics/ocean.rst
trunk/blender_docs/manual/physics/rigid_body/index.rst
trunk/blender_docs/manual/physics/rigid_body/properties/settings.rst
trunk/blender_docs/manual/scene_layout/object/editing/index.rst
trunk/blender_docs/manual/sculpt_paint/sculpting/editing/mask.rst
trunk/blender_docs/manual/video_editing/preview/introduction.rst
Added Paths:
-----------
trunk/blender_docs/manual/physics/rigid_body/editing.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs 2021-05-17 19:15:32 UTC (rev 8040)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/branches/blender-2.92-release/blender_docs:7610-7921
-/branches/blender-2.93-release/blender_docs:7959-8003
\ No newline at end of property
+/branches/blender-2.93-release/blender_docs:7959-8039
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/armatures/properties/display.rst
===================================================================
--- trunk/blender_docs/manual/animation/armatures/properties/display.rst 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs/manual/animation/armatures/properties/display.rst 2021-05-17 19:15:32 UTC (rev 8040)
@@ -99,13 +99,9 @@
The same armature in Edit Mode.
-.. _bpy.types.Armature.show_axes:
-
Show
Names
Displays the name of each bone.
- Axes
- When enabled, the (local) axes of each bone are displayed (only relevant for *Edit Mode* and *Pose Mode*).
Shapes
When enabled, the default standard bone shape is replaced,
in *Object Mode* and *Pose Mode*, by the shape of a chosen object
@@ -118,3 +114,12 @@
the solid objects (meshes, surfaces, ...). I.e. they will always be visible and selectable
(this is the same option as the one found in the *Display* panel of the *Object data* tab).
Very useful when not in *Wireframe* mode.
+
+.. _bpy.types.Armature.show_axes:
+
+Axis
+ When enabled, the (local) axes of each bone are displayed (only relevant for *Edit Mode* and *Pose Mode*).
+
+ Position
+ The position for the axes display on the bone.
+ Increasing the value moves it closer to the tip; decreasing moves it closer to the root.
Modified: trunk/blender_docs/manual/compositing/types/groups.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/groups.rst 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs/manual/compositing/types/groups.rst 2021-05-17 19:15:32 UTC (rev 8040)
@@ -1,6 +1,7 @@
.. _bpy.types.CompositorNodeGroup:
.. Editors Note: This page gets copied into:
- :doc:`/editors/texture_node/types/groups`
+ - :doc:`/modeling/geometry_nodes/group`
- :doc:`/render/shader_nodes/groups`
.. --- copy below this line ---
@@ -25,6 +26,20 @@
Removes the selected nodes from a group, see :ref:`bpy.ops.node.group_ungroup` for more information.
+Group Input
+===========
+
+Adds a group input node, this serves as a convenient way to re-add the input node incase it is accidentally deleted.
+Note, groups can only have one input/output, if more than one is added they are essentially duplicates of each other.
+
+
+Group Output
+============
+
+Adds a group output node, this serves as a convenient way to re-add the out node incase it is accidentally deleted.
+Note, groups can only have one input/output, if more than one is added they are essentially duplicates of each other.
+
+
Node Groups
===========
Modified: trunk/blender_docs/manual/editors/preferences/addons.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/addons.rst 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs/manual/editors/preferences/addons.rst 2021-05-17 19:15:32 UTC (rev 8040)
@@ -33,34 +33,9 @@
Add-ons are divided into categories by what areas of Blender they affect.
-Enabling and Disabling
-======================
+Installing Add-ons
+==================
-Enable and disable an add-on by checking or unchecking the box to the right
-of the add-on you chose, as shown in the figure below.
-
-.. figure:: /images/editors_preferences_addons_enable.png
-
- Enabling an add-on.
-
-The add-on functionality should be immediately available.
-
-.. note::
-
- Add-ons that activate or change multiple hotkeys have a special system of activation.
- For example, with the "UI: Pie Menu Official" add-on
- for each menu there is a selection box to activate the menu and its hotkey.
-
-.. tip::
-
- If the Add-on does not activate when enabled,
- check the :doc:`Console window </advanced/command_line/introduction>`
- for any errors that may have occurred.
-
-
-3rd Party Add-ons
------------------
-
There are hundreds of add-ons that are not distributed with Blender and are developed by others.
To add them to the list of other add-ons, they must be installed into Blender.
@@ -90,6 +65,31 @@
Blender will copy newly installed add-ons under the directory selected in your Preferences.
+Enabling & Disabling Add-ons
+============================
+
+To enable or disable an add-on check or uncheck the box to the right
+of the add-onas shown in the figure below.
+
+.. figure:: /images/editors_preferences_addons_enable.png
+
+ Enabling an add-on.
+
+The add-on functionality should be immediately available.
+
+.. note::
+
+ Add-ons that activate or change multiple hotkeys have a special system of activation.
+ For example, with the :doc:`/addons/interface/viewport_pies` add-on
+ for each menu there is a selection box to activate the menu and its hotkey.
+
+.. tip::
+
+ If the Add-on does not activate when enabled,
+ check the :doc:`Console window </advanced/command_line/introduction>`
+ for any errors that may have occurred.
+
+
Add-on Information
==================
@@ -98,7 +98,6 @@
Here you can also find a button to report a bug specific of this add-on.
-.. _prefs-addons-prefs:
.. _bpy.types.AddonPreferences:
Add-on Preferences
Modified: trunk/blender_docs/manual/editors/timeline.rst
===================================================================
--- trunk/blender_docs/manual/editors/timeline.rst 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs/manual/editors/timeline.rst 2021-05-17 19:15:32 UTC (rev 8040)
@@ -184,6 +184,8 @@
The *Keying* popover contains options that affect keyframe insertion.
+.. _bpy.types.KeyingSetsAll.active:
+
Active Keying Set
.. figure:: /images/editors_timeline_keying-sets.png
:align: right
@@ -198,15 +200,33 @@
Custom keying sets can be defined in the panels
:menuselection:`Properties --> Scene --> Keying Sets + Active Keying Set`.
+ .. _bpy.ops.anim.keyframe_insert:
+
Insert Keyframes (plus icon)
Insert keyframes on the current frame for the properties in the active *Keying Set*.
+
+ .. _bpy.ops.anim.keyframe_delete:
+
Delete Keyframes (minus icon)
Delete keyframes on the current frame for the properties in the active *Keying Set*.
+.. _bpy.types.ToolSettings.keyframe_type:
+
New Keyframe Type
:ref:`keyframe-type` on insertion.
+.. _bpy.types.ToolSettings.use_keyframe_cycle_aware:
+Cycle-Aware Keying
+ When inserting keyframes into :ref:`trivially cyclic curves <bpy.types.FModifierCycles>`, special handling
+ is applied to preserve the cycle integrity (most useful while tweaking an established cycle):
+
+ - If a key insertion is attempted outside of the main time range of the cycle,
+ it is remapped back inside the range.
+ - When overwriting one of the end keys,
+ the other one is updated appropriately.
+
+
.. Move to some content to animation?
.. _bpy.types.ToolSettings.use_keyframe_insert_auto:
@@ -248,16 +268,7 @@
Layered Recording
Adds a new NLA Track and strip for every loop/pass made over the animation to allow non-destructive tweaking.
-Cycle-Aware Keying
- When inserting keyframes into :ref:`trivially cyclic curves <bpy.types.FModifierCycles>`, special handling
- is applied to preserve the cycle integrity (most useful while tweaking an established cycle):
- - If a key insertion is attempted outside of the main time range of the cycle,
- it is remapped back inside the range.
- - When overwriting one of the end keys,
- the other one is updated appropriately.
-
-
Menus
-----
Modified: trunk/blender_docs/manual/interface/controls/nodes/parts.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/parts.rst 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs/manual/interface/controls/nodes/parts.rst 2021-05-17 19:15:32 UTC (rev 8040)
@@ -79,7 +79,10 @@
has a default value which can be edited via a color, numeric, or vector interface input.
In the screenshot of the node above, the second color option is set by a color interface input.
+Some nodes have special sockets that can accept multiple inputs into a single socket.
+These sockets will have an ellipsis shape rather than a circle to indicate its special behavior.
+
Outputs
-------
Modified: trunk/blender_docs/manual/modeling/meshes/editing/face/face_data.rst
===================================================================
--- trunk/blender_docs/manual/modeling/meshes/editing/face/face_data.rst 2021-05-17 18:52:45 UTC (rev 8039)
+++ trunk/blender_docs/manual/modeling/meshes/editing/face/face_data.rst 2021-05-17 19:15:32 UTC (rev 8040)
@@ -1,18 +1,81 @@
-.. _bpy.ops.mesh.colors_rotate:
-.. _bpy.ops.mesh.colors_reverse:
-.. _bpy.ops.mesh.mark_freestyle_face:
*********
Face Data
*********
+.. _bpy.ops.mesh.colors_rotate:
+
Rotate Colors
- Rotates the Vertex Colors inside faces either clockwise or counterclockwise.
+=============
+
+.. admonition:: Reference
+ :class: refbox
+
+ :Mode: Edit Mode
+ :Menu: :menuselection:`Face --> Face Data --> Rotate Colors`
+
+Rotates the Vertex Colors inside faces either clockwise or counterclockwise.
+
+
+.. _bpy.ops.mesh.colors_reverse:
+
Reverse Colors
- Flips the direction of Vertex Colors inside the selected faces.
-Rotate/Reverse UVs
- See :ref:`uv-image-rotate-reverse-uvs`.
+==============
+
+.. admonition:: Reference
+ :class: refbox
+
+ :Mode: Edit Mode
+ :Menu: :menuselection:`Face --> Face Data --> Reverse Colors`
+
+Flips the direction of Vertex Colors inside the selected faces.
+
+
+Rotate UVs
+==========
+
+.. admonition:: Reference
+ :class: refbox
+
+ :Mode: Edit Mode
+ :Menu: :menuselection:`Face --> Face Data --> Rotate UVs`
+
+See :ref:`bpy.ops.mesh.uvs_rotate`.
+
+
+Reverse UVs
+===========
+
+.. admonition:: Reference
+ :class: refbox
+
+ :Mode: Edit Mode
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list