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

Aaron Carlisle noreply at blender.org
Tue Nov 30 18:12:06 CET 2021 

Revision: 8715
          https://developer.blender.org/rBM8715
Author:   Blendify
Date:     2021-11-30 18:12:06 +0100 (Tue, 30 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/addons/interface/collection_manager.rst
    trunk/blender_docs/manual/addons/object/greasepencil_tools.rst
    trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst
    trunk/blender_docs/manual/compositing/types/color/index.rst
    trunk/blender_docs/manual/editors/preferences/save_load.rst
    trunk/blender_docs/manual/editors/preferences/system.rst
    trunk/blender_docs/manual/editors/spreadsheet.rst
    trunk/blender_docs/manual/editors/video_sequencer/sequencer/display.rst
    trunk/blender_docs/manual/files/asset_libraries/catalogs.rst
    trunk/blender_docs/manual/files/import_export/usd.rst
    trunk/blender_docs/manual/files/linked_libraries/library_proxies.rst
    trunk/blender_docs/manual/glossary/index.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/dash.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/length.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
    trunk/blender_docs/manual/interface/controls/nodes/parts.rst
    trunk/blender_docs/manual/interface/window_system/regions.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/capture_attribute.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/curve/trim_curve.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/fields.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/geometry/geometry_proximity.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/mesh_primitives/cylinder.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/output/viewer.rst
    trunk/blender_docs/manual/render/cycles/gpu_rendering.rst
    trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst
    trunk/blender_docs/manual/render/output/audio/speaker.rst
    trunk/blender_docs/manual/render/output/properties/post_processing.rst
    trunk/blender_docs/manual/scene_layout/object/editing/asset.rst
    trunk/blender_docs/manual/video_editing/preview/sidebar.rst
    trunk/blender_docs/manual/video_editing/sequencer/selecting.rst
    trunk/blender_docs/manual/video_editing/sequencer/sidebar/strip.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/color.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/effects/alpha_over_under_overdrop.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/movie.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/sound.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/transitions/sound_crossfade.rst

Property Changed:
----------------
    trunk/blender_docs/
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/length.rst

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-11-30 15:31:14 UTC (rev 8714)
+++ trunk/blender_docs	2021-11-30 17:12:06 UTC (rev 8715)

Property changes on: trunk/blender_docs
___________________________________________________________________
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-8707
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8714
\ No newline at end of property
Modified: trunk/blender_docs/manual/addons/interface/collection_manager.rst
===================================================================
--- trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-11-30 15:31:14 UTC (rev 8714)
+++ trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-11-30 17:12:06 UTC (rev 8715)
@@ -177,7 +177,6 @@
 
          See the section in the Scene Collection for more details.
 
-
    Send Objects to Collection (multiple icons)
       - :kbd:`LMB` -- Move selected object(s) to collection.
       - :kbd:`Shift-LMB` -- Add/Remove selected object(s) to/from collection.
@@ -266,9 +265,8 @@
    - Select All QCD Objects. (Select all objects that belong to enabled QCD slots)
    - Discard QCD History. (Discards previous QCD slot states)
 
+   Hotkeys:
 
-   .. rubric:: Hotkeys
-
    - :kbd:`LMB` -- Enable All QCD Slots.
    - :kbd:`Alt-LMB` -- Select All QCD Objects.
    - :kbd:`LMB` hold down -- Opens a menu with all Quick View Toggles.
@@ -287,9 +285,8 @@
    - ``circle icon`` -- one or more objects in this slot are selected.
    - ``dot icon`` -- the active object is in this slot.
 
+   Assigned Slot Hotkeys:
 
-   .. rubric:: Assigned Slot Hotkeys
-
    - :kbd:`LMB` -- View single slot excluding all others.
    - :kbd:`Shift-LMB` -- Add/remove slot to/from view.
    - :kbd:`Ctrl-LMB` -- Move selected objects to slot.
@@ -297,9 +294,8 @@
    - :kbd:`Alt-LMB` -- Replace selection with objects in this slot.
    - :kbd:`Shift-Alt-LMB` -- Add/remove slot objects to/from the selection.
 
+   Unassigned Slot Hotkeys:
 
-   .. rubric:: Unassigned Slot Hotkeys
-
    - :kbd:`LMB` -- Create the slot.
    - :kbd:`Shift-LMB` -- Create the slot and isolate it, excluding all others from view.
    - :kbd:`Ctrl-LMB` -- Create the slot and move the selected objects to it.

Modified: trunk/blender_docs/manual/addons/object/greasepencil_tools.rst
===================================================================
--- trunk/blender_docs/manual/addons/object/greasepencil_tools.rst	2021-11-30 15:31:14 UTC (rev 8714)
+++ trunk/blender_docs/manual/addons/object/greasepencil_tools.rst	2021-11-30 17:12:06 UTC (rev 8715)
@@ -73,7 +73,8 @@
 
 .. note::
 
-   This feature will be removed once the  :doc:`Blender Asset Browser </editors/asset_browser>`  has support for brushes.
+   This feature will be removed once the :doc:`Blender Asset Browser </editors/asset_browser>`
+   has support for brushes.
 
 .. reference::
 

Modified: trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst
===================================================================
--- trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst	2021-11-30 15:31:14 UTC (rev 8714)
+++ trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst	2021-11-30 17:12:06 UTC (rev 8715)
@@ -108,9 +108,9 @@
 - Blender remembers which action was previously assigned to the armature.
 - The new pose Action is assigned to the armature so you can give it a name and
   inspect/adjust its contents.
-- Click **the “back” button** that appeared next to the Create Pose Asset button.
-  This **reassigns the previous Action**, so that you’re back at the animation you
-  had before.
+- Click the *Restore Previous Action* button (back arrow icon) that appeared
+  next to the Create Pose Asset button. This **reassigns the previous Action**,
+  so that you’re back at the animation you had before.
 
 
 .. _bpy.ops.poselib.copy_as_asset:
@@ -174,30 +174,30 @@
   rendering the thumbnails. Pose library files are intended for that purpose: to
   contain the poses and render their preview images.
 
-The preview images are rendered using the
-:doc:`Workbench Engine </render/workbench/index>`. Switch the scene to use that
-as render engine, and you’ll see various options to influence the look. Select a
-pose asset and press the Generate Preview button to re-render the preview image
-with the current settings.
+The preview images are rendered using the :doc:`Workbench Engine </render/workbench/index>`. Switch
+the scene to use that as render engine, and you'll see various options to influence the look.
+Select a pose asset and press the Generate Preview button to re-render the preview image with
+the current settings.
 
-You can also animate settings, such as the background colour, light positions
-and intensities, etc. Use this to your advantage!
+You can also animate settings such as matcap rendering, light positions, and
+intensities, etc. Use this to your advantage!
 
 
 Scene Animation for Preview Images
 ----------------------------------
 
-Sometimes it’s handy to have a few different background colours or camera angles
+Sometimes it's handy to have a few different background colors or camera angles
 for your poses. Many facial poses are made with a specific camera angle in mind.
 
-- Background colour can be animated. In this case just for fun, but for more
-  serious applications this could be used to indicate a certain character, or a
-  mood, or anything else.
+- Background color can be animated by placing a plane behind the character and
+  animating its material. In this case just for fun, but for more serious
+  applications this could be used to indicate a certain character, or a mood, or
+  anything else.
 - The active camera can be switched by using :ref:`camera markers <bpy.ops.marker.camera_bind>`.
 
-Both make it possible to choose a specific frame to pick the background colour
+Both make it possible to choose a specific frame to pick the background color
 and camera angle. Pose the character, click the *Create Pose Asset* button, and
-the pose Action will be keyed on the current frame. This means it’s easy to edit
+the pose action will be keyed on the current frame. This means it's easy to edit
 the pose and refresh its preview image, because you know exactly which frame it
 was originally created on.
 
@@ -220,28 +220,31 @@
 :doc:`catalog system </files/asset_libraries/catalogs>` and the filter bar at
 the top can be used to search for specific poses.
 
-Click the **Apply** button to apply the pose to the character. If there are any
-bones selected, the pose will be applied only to those bones. This makes it
-possible to create a “finger guns” pose by applying a fist pose to the hand, and
-then an “open hand” pose for only the index finger and thumb. Double-clicking a
-pose will also apply it.
+Apply
+   Applies the pose to the character. If there are any bones selected, the pose
+   will be applied only to those bones. This makes it possible to create a
+   “finger guns” pose by applying a fist pose to the hand, and then an “open
+   hand” pose for only the index finger and thumb. Double-clicking a pose will
+   also apply it.
 
-The **Interactive Blend** button allows you to gradually blend a pose from the
-library into the character’s pose. Click the button, then move the mouse
-left/right to determine the desired blend. While blending, you can use the Tab
-key to toggle between the original and the blended pose. As usual in Blender,
-left-click or press Enter to confirm; right-click or press Escape to cancel the
-operator.
+Interactive Blend
+   Allows you to gradually blend a pose from the library into the character’s
+   pose. Click the button, then move the mouse left/right to determine the
+   desired blend. While blending, you can use the Tab key to toggle between the
+   original and the blended pose. As usual in Blender, left-click or press Enter
+   to confirm; right-click or press Escape to cancel the operator.
 
-The **Flip Pose** checkbox will mirror the pose from left to right and vice
-versa. This makes it possible, for example, to apply a left-hand pose to the
-right hand, reducing the number of poses you have to put into the library. This
-can of course also be applied for asymmetrical facial expressions that depend on
-the camera angle.
+Flip Pose
+   Will mirror the pose from left to right and vice versa. This makes it
+   possible, for example, to apply a left-hand pose to the right hand, reducing
+   the number of poses you have to put into the library. This can of course also
+   be applied for asymmetrical facial expressions that depend on the camera
+   angle.
 
-Finally, the **Select** and **Deselect** buttons (de)select the bones that are
-used in the pose. This can be used to create a selection set, or simply to
-remind yourself what was part of the pose and what wasn’t.
+Select & Deselect
+   Select or deselect the bones that are used in the pose. This can be used to
+   create a selection set, or simply to remind yourself what was part of the
+   pose and what wasn’t.
 
 .. _pose-library-from-viewport:
 

Modified: trunk/blender_docs/manual/compositing/types/color/index.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/color/index.rst	2021-11-30 15:31:14 UTC (rev 8714)
+++ trunk/blender_docs/manual/compositing/types/color/index.rst	2021-11-30 17:12:06 UTC (rev 8715)
@@ -23,4 +23,4 @@
    posterize.rst
    rgb_curves.rst
    tone_map.rst
-   z_combine.rst 
+   z_combine.rst

Modified: trunk/blender_docs/manual/editors/preferences/save_load.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/save_load.rst	2021-11-30 15:31:14 UTC (rev 8714)
+++ trunk/blender_docs/manual/editors/preferences/save_load.rst	2021-11-30 17:12:06 UTC (rev 8715)
@@ -22,12 +22,12 @@
    These previews are used both in the :doc:`File Browser </editors/file_browser>`
    and for previews shown in the operating system's file browser.
 
-   :None: Do not generate any blend-file previews
+   :None: Do not generate any blend-file previews.

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list