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

Aaron Carlisle noreply at blender.org
Thu Dec 2 05:18:56 CET 2021 

Revision: 8732
          https://developer.blender.org/rBM8732
Author:   Blendify
Date:     2021-12-02 05:18:55 +0100 (Thu, 02 Dec 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/editors/uv/index.rst
    trunk/blender_docs/manual/editors/uv/introduction.rst
    trunk/blender_docs/manual/editors/uv/overlays.rst
    trunk/blender_docs/manual/editors/uv/sidebar.rst
    trunk/blender_docs/manual/files/import_export/alembic.rst
    trunk/blender_docs/manual/modeling/meshes/uv/editing.rst

Added Paths:
-----------
    trunk/blender_docs/manual/editors/uv/controls/

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs	2021-12-02 04:18:55 UTC (rev 8732)

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-8725
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8731
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/uv/index.rst
===================================================================
--- trunk/blender_docs/manual/editors/uv/index.rst	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs/manual/editors/uv/index.rst	2021-12-02 04:18:55 UTC (rev 8732)
@@ -13,3 +13,4 @@
    overlays.rst
    sidebar.rst
    selecting.rst
+   controls/snapping.rst

Modified: trunk/blender_docs/manual/editors/uv/introduction.rst
===================================================================
--- trunk/blender_docs/manual/editors/uv/introduction.rst	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs/manual/editors/uv/introduction.rst	2021-12-02 04:18:55 UTC (rev 8732)
@@ -144,16 +144,17 @@
 Display Channels
    Select what color channels are displayed.
 
-   Color and Alpha
+   :Color and Alpha:
       Replaces transparent pixels with background checkerboard, denoting the alpha channel.
-   Color
+   :Color:
       Display the colored image, without alpha channel.
-   Alpha
-      Displays the Alpha channel a grayscale image. White areas are opaque, black areas have an alpha of 0.
-   Z-Buffer
+   :Alpha:
+      Displays the Alpha channel a grayscale image.
+      White areas are opaque, black areas have an alpha of 0.
+   :Z-Buffer:
       Display the depth from the camera, from Clip Start to Clip End,
       as specified in the :doc:`Camera settings </render/cameras>`.
-   Red, Green, Blue
+   :Red, Green, Blue:
       Single Color Channel visualized as a grayscale image.
 
 
@@ -162,7 +163,7 @@
 
 Pivot
    Similar to working with pivot points in the 3D Viewport.
-UV Snapping
-   Similar to Snapping in the 3D Viewport.
+:doc:`UV Snapping </editors/uv/controls/snapping>`
+   Controls to snap UV points, similar to snapping in the 3D Viewport.
 Proportional Editing
    See :doc:`Proportional Editing </editors/3dview/controls/proportional_editing>`.

Modified: trunk/blender_docs/manual/editors/uv/overlays.rst
===================================================================
--- trunk/blender_docs/manual/editors/uv/overlays.rst	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs/manual/editors/uv/overlays.rst	2021-12-02 04:18:55 UTC (rev 8732)
@@ -8,10 +8,17 @@
 This option also toggles the visibility of :doc:`/modeling/meshes/uv/workflows/udims` tile information.
 The options that are visible in the pop-over depend on the UV Editor mode.
 
+.. seealso::
 
+   Addition :doc:`View Properties </editors/uv/sidebar>` can be configured in the sidebar.
+
+
 UV Editing
 ==========
 
+.. _bpy.types.SpaceUVEditor.display_stretch_type:
+.. _bpy.types.SpaceUVEditor.show_stretch:
+
 Display Stretch
    Shows how much of a difference there is between UV coordinates and 3D coordinates.
    Blue means low distortion, while Red means high distortion.
@@ -26,21 +33,23 @@
 UV Opacity
    Opacity of the above UV overlays.
 
+.. _bpy.types.SpaceUVEditor.edge_display_type:
+
 Display As
    Controls how edges are shown.
 
-   Outline
-      Display white edges with black outline.
-   Dash
-      Display dashed black-white edges.
-   Black
-      Display black edges.
-   White
-      Display white edges.
+   :Outline: Display white edges with black outline.
+   :Dash: Display dashed black-white edges.
+   :Black: Display black edges.
+   :White: Display white edges.
 
+.. _bpy.types.SpaceUVEditor.show_modified_edges:
+
 Modified Edges
    Show results of modifiers in the UV display.
 
+.. _bpy.types.SpaceUVEditor.show_faces:
+
 Faces
    Display faces over the image.
 

Modified: trunk/blender_docs/manual/editors/uv/sidebar.rst
===================================================================
--- trunk/blender_docs/manual/editors/uv/sidebar.rst	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs/manual/editors/uv/sidebar.rst	2021-12-02 04:18:55 UTC (rev 8732)
@@ -68,6 +68,22 @@
 Options for the :doc:`annotation tool </interface/annotate_tool>`.
 
 
+.. _bpy.types.SpaceUVEditor.use_custom_grid:
+
+Custom Grid
+-----------
+
+Displays a grid that does not depend on the zoom level to determine
+the number of subdivisions. The Custom Grid is useful in combination with
+:ref:`Absolute Grid Snap <bpy.types.ToolSettings.use_snap_uv_grid_absolute>`
+to create precise incremental snapping.
+
+.. _bpy.types.SpaceUVEditor.custom_grid_subdivisions:
+
+Subdivisions
+   The number of grid units in UV that make one UV unit.
+
+
 .. (TODO add) images per type
 
 Scopes
@@ -74,4 +90,3 @@
 ======
 
 See :ref:`editors-image-scopes` in the Image Editor.
-

Modified: trunk/blender_docs/manual/files/import_export/alembic.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/alembic.rst	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs/manual/files/import_export/alembic.rst	2021-12-02 04:18:55 UTC (rev 8732)
@@ -136,7 +136,7 @@
 Pack UV Islands
    Generates an optimized UV layout with non-overlapping islands
    that tries to efficiently fill the :term:`Texture Space`.
-   See the :ref:`pack islands operator <editors-uv-editing-layout-pack_islands>`
+   See the :ref:`pack islands operator <bpy.ops.uv.pack_islands>`
    that works with the same principle for more information.
 
 Normals

Modified: trunk/blender_docs/manual/modeling/meshes/uv/editing.rst
===================================================================
--- trunk/blender_docs/manual/modeling/meshes/uv/editing.rst	2021-12-02 04:15:14 UTC (rev 8731)
+++ trunk/blender_docs/manual/modeling/meshes/uv/editing.rst	2021-12-02 04:18:55 UTC (rev 8732)
@@ -235,7 +235,6 @@
 
 
 .. _bpy.ops.uv.pack_islands:
-.. _editors-uv-editing-layout-pack_islands:
 
 Pack Islands
 ============
@@ -253,7 +252,17 @@
 First it will uniformly scale the selected island,
 then individually transform each island so that they fill up the UV space as much as possible.
 
+Pack to
+   The :doc:`UDIM </modeling/meshes/uv/workflows/udims>` grid to pack UV islands into.
 
+   :Closest UDIM: Pack islands to closest UDIM.
+   :Active UDIM: Pack islands to active UDIM image tile or UDIM grid tile where 2D cursor is located.
+Rotate
+   Allow islands to be rotated to possible get a tighter fit.
+Margin
+   The target empty space between islands.
+
+
 .. _bpy.ops.uv.average_islands_scale:
 
 Average Island Scale

More information about the Bf-docboard-svn mailing list