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

Aaron Carlisle noreply at blender.org
Wed Dec 1 01:06:34 CET 2021 

Revision: 8726
          https://developer.blender.org/rBM8726
Author:   Blendify
Date:     2021-12-01 01:06:34 +0100 (Wed, 01 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/asset_browser.rst
    trunk/blender_docs/manual/editors/clip/sidebar.rst
    trunk/blender_docs/manual/editors/video_sequencer/preview/display/overlays.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
    trunk/blender_docs/manual/interface/controls/nodes/introduction.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/mask.rst
    trunk/blender_docs/manual/modeling/modifiers/modify/mesh_cache.rst
    trunk/blender_docs/manual/movie_clip/tracking/dope_sheet.rst
    trunk/blender_docs/manual/render/cycles/render_settings/light_paths.rst
    trunk/blender_docs/manual/render/shader_nodes/input/hair_info.rst
    trunk/blender_docs/manual/video_editing/preview/sidebar.rst

Added Paths:
-----------
    trunk/blender_docs/manual/images/modeling_modifiers_generate_mask_vertex-group_smooth.png

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs	2021-12-01 00:06:34 UTC (rev 8726)

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-8714
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8725
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/editors/asset_browser.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -62,9 +62,9 @@
 .. _bpy.ops.asset.bundle_install:
 
 Copy Asset Bundle to Library
-   Shown when the Library Selector is set to Current File, the current .blend
-   file is considered an :ref:`Asset Bundle <asset-bundles>`, and is not yet
-   located inside any Asset Library.
+   Shown when the Library Selector is set to Current File, the current
+   blend-file file is considered an :ref:`Asset Bundle <asset-bundles>`,
+   and is not yet located inside any Asset Library.
 
    The Copy Asset Bundle operator makes it simple to copy the file into the
    asset library. The catalogs of the asset bundle will be merged into the asset
@@ -74,6 +74,10 @@
    Shows the :doc:`catalogs </files/asset_libraries/catalogs>` of the active
    Asset Library.
 
+   Catalogs can be remained by double clicking on there name.
+   Catalogs can also be nested inside others by dragging and dropping one
+   catalog into another.
+
 Optional Panels
    Add-ons and features like the
    :doc:`/animation/armatures/posing/editing/pose_library`

Modified: trunk/blender_docs/manual/editors/clip/sidebar.rst
===================================================================
--- trunk/blender_docs/manual/editors/clip/sidebar.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/editors/clip/sidebar.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -71,3 +71,22 @@
 ----------------
 
 See :doc:`/editors/image/image_settings`.
+
+
+View
+====
+
+2D Cursor
+---------
+
+The 2D cursor is the dashed grey crosshair that is shown in the image preview region.
+It can be used by setting the Pivot Point to 2D Cursor to transform all points
+in relation to the location of thr 2D Cursor.
+
+.. _bpy.types.SpaceClipEditor.cursor_location:
+
+Location X, Y
+   The location of the 2D Cursor relative to the bottom left of the preview region.
+   The edge of the image with be 1 away, so (0.5, 0.5) will be the the center of the image.
+
+   The 2D Cursor's location can also be set with :kbd:`Shift-RMB`.

Modified: trunk/blender_docs/manual/editors/video_sequencer/preview/display/overlays.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/preview/display/overlays.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/editors/video_sequencer/preview/display/overlays.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -10,6 +10,11 @@
 
 .. rubric:: Preview Overlays
 
+.. _bpy.types.SequencerPreviewOverlay.show_cursor:
+
+2D Cursor
+   Shows the :ref:`editors_sequencer_preview_2d-cursor` in the image preview region.
+
 Frame Overlay
    Displays the :ref:`Frame Overlay <bpy.types.SequenceEditor.show_overlay>`,
    to compare the current frame to a reference frame.

Modified: trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/grease_pencil/modifiers/generate/line_art.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -213,11 +213,16 @@
 .. _bpy.types.LineartGpencilModifier.overscan:
 
 Overscan
-   To optimize rendering, Blender only renders the lines for portions of the object that are in the camera's view.
+   To optimize rendering, Blender only renders the strokes for edges of the object that are in the camera's view.
    This optimization however, can result in strokes ending abruptly at the edge of the image.
 
    This value prevents this error by adding a margin outside the camera's view to continue computing strokes.
 
+.. _bpy.types.LineartGpencilModifier.use_image_boundary_trimming:
+
+Image Boundary Trimming
+   Trim all stroke right at the boundary of image (including overscan region).
+
 .. _bpy.types.LineartGpencilModifier.stroke_depth_offset:
 
 Depth Offset

Copied: trunk/blender_docs/manual/images/modeling_modifiers_generate_mask_vertex-group_smooth.png (from rev 8725, branches/blender-3.0-release/blender_docs/manual/images/modeling_modifiers_generate_mask_vertex-group_smooth.png)
===================================================================
(Binary files differ)

Modified: trunk/blender_docs/manual/interface/controls/nodes/introduction.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/introduction.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/interface/controls/nodes/introduction.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -68,6 +68,25 @@
    Change options for snapping node positions to achieve a cleaner node tree layout.
 
 
+.. _bpy.types.SpaceNodeOverlay.show_overlays:
+
+Overlays
+^^^^^^^^
+
+Overlays are information that is displayed on top of the nodes and node trees.
+There is a toggle to show or hide all overlays for the node editor next to the overlay pop over.
+
+.. _bpy.types.SpaceNodeOverlay.show_wire_color:
+
+Wire Colors
+   Color node links based on their connected sockets
+
+.. _bpy.types.SpaceNodeEditor.show_annotation:
+
+Annotations
+   Displays :doc:`Annotations </interface/annotate_tool>` in the preview region.
+
+
 Toolbar
 -------
 

Modified: trunk/blender_docs/manual/modeling/modifiers/generate/mask.rst
===================================================================
--- trunk/blender_docs/manual/modeling/modifiers/generate/mask.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/modeling/modifiers/generate/mask.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -34,6 +34,12 @@
 
            - .. figure:: /images/modeling_modifiers_generate_mask_panel-armature.png
 
+Smooth
+   When using Vertex Group *Mode*, use weights to cut faces at the weight contour.
+   This option will result in a mask that has smoother removing the sharp edges along the mask edges.
+
+   .. figure:: /images/modeling_modifiers_generate_mask_vertex-group_smooth.png
+
 Invert
    Normally, vertices belonging to the selected vertex group (or group associated with the active pose bone)
    will be shown. The *Invert* toggle allows you to reverse this behavior, instead only showing vertices

Modified: trunk/blender_docs/manual/modeling/modifiers/modify/mesh_cache.rst
===================================================================
--- trunk/blender_docs/manual/modeling/modifiers/modify/mesh_cache.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/modeling/modifiers/modify/mesh_cache.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -50,7 +50,16 @@
    *None*, or *Linear*, which will blend between frames.
    Use linear when the frames in the cache file do not match up exactly with the frames in the blend-file.
 
+Vertex Group
+   If set, restrict the effect to the only vertices in that vertex group.
 
+   Invert ``<->``
+      Inverts the influence of the selected vertex group, meaning that the group
+      now represents vertices that will not be deformed by the modifier.
+
+      The setting reverses the weight values of the group.
+
+
 Time Remapping
 --------------
 
@@ -57,19 +66,19 @@
 Time Mode
    Select how time is calculated.
 
-   Frame
+   :Frame:
       Allows you to control the frames,
       which will ignore timing data in the file but is often useful since it gives simple control.
-   Time
+   :Time:
       Evaluates time in seconds,
       taking into account timing information from the file (offset and frame-times).
-   Factor
+   :Factor:
       Evaluates the entire animation as a value in the [0, 1] range.
 
 Play Mode
    Select how playback operates.
 
-   Scene
+   :Scene:
       Use the current frame from the scene to control playback.
 
       Frame Start
@@ -77,7 +86,7 @@
       Frame Scale
          Scale time by this factor (applied after the start value).
 
-   Custom
+   :Custom:
       Control animation timing manually.
 
       Evaluation Value

Modified: trunk/blender_docs/manual/movie_clip/tracking/dope_sheet.rst
===================================================================
--- trunk/blender_docs/manual/movie_clip/tracking/dope_sheet.rst	2021-11-30 23:47:26 UTC (rev 8725)
+++ trunk/blender_docs/manual/movie_clip/tracking/dope_sheet.rst	2021-12-01 00:06:34 UTC (rev 8726)
@@ -33,22 +33,25 @@
 
    Sort order of the channels.
 
-Show
-   Only Selected (mouse cursor icon)
-      Limits Dope Sheet channels to only information about selected tracks.
-   Hidden (ghost icon)
-      Includes information from hidden tracks.
+Show Only Selected (mouse cursor icon)
+   Limits Dope Sheet channels to only information about selected tracks.
+Hidden (ghost icon)
+   Includes information from hidden tracks.
+
+.. _bpy.types.MovieTrackingDopesheet.sort_method:
+
 Sort Method
    Sort order of the tracks.
 
-   Name
-      Sort selected tracks in alphabetical order based on their names.
-   Longest
-      Sort tracks by longest tracked segment length.
-   Total
-      Sort tracks by overall amount of frames.
-   Average Error
-      Sort tracks by their average reprojection error after solving camera or object motion.
+   :Name: Sort selected tracks in alphabetical order based on their names.
+   :Longest: Sort tracks by longest tracked segment length.
+   :Total: Sort tracks by overall amount of frames.
+   :Average Error: Sort tracks by their average reprojection error after solving camera or object motion.
+   :Start Frame: Sort channels by first frame number.
+   :End Frame: Sort channels by last frame number.
+

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list