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

Sun May 23 03:33:18 CEST 2021

Revision: 8073
          https://developer.blender.org/rBM8073
Author:   Imaginer
Date:     2021-05-23 03:33:17 +0200 (Sun, 23 May 2021)
Log Message:
-----------
Merge branch 'blender-2.93-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/addons/interface/collection_manager.rst
    trunk/blender_docs/manual/files/media/image_formats.rst
    trunk/blender_docs/manual/images/addons_interface_collection-manager_popup.png

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

Index: trunk/blender_docs
===================================================================

--- trunk/blender_docs	2021-05-23 01:24:40 UTC (rev 8072)
+++ trunk/blender_docs	2021-05-23 01:33:17 UTC (rev 8073)

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-8069
\ No newline at end of property
+/branches/blender-2.93-release/blender_docs:7959-8072
\ 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-05-23 01:24:40 UTC (rev 8072)
+++ trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-05-23 01:33:17 UTC (rev 8073)
@@ -55,6 +55,16 @@
 
       All options can be combined with each other.
 
+Undo
+   Undoes the previous action.
+
+   .. note::
+
+      Clears any in progress copy/swap actions.
+
+Redo
+   Redoes the previously undone action.
+
 Specials
    Remove Empty Collections
       Remove all collections that have no subcollections or objects.
@@ -74,10 +84,41 @@
    Name
       This is static and can't be edited.
 
-   Set Object (box icon)
-      - :kbd:`LMB` -- Move object(s) to collection.
-      - :kbd:`Shift-LMB` -- Add/Remove object(s) to/from collection.
+   Select All Objects in the Collection (multiple icons)
+      - :kbd:`LMB` -- Select all of the objects in the collection (deselects all other objects).
+      - :kbd:`Shift-LMB` -- Add/Remove all of the objects in the collection to/from the selection.
+      - :kbd:`Ctrl-LMB` -- Select all of the objects in the collection and all of its subcollections (deselects all other objects).
+      - :kbd:`Ctrl-Shift-LMB` -- Add/Remove all of the objects in the collection and all of its subcollections to/from the selection.
 
+      Icons and button highlights are used to show the selection state:
+         - ``no icon`` -- No objects are present in this collection to be selected.
+         - ``no highlight`` -- No objects are selected in this collection.
+         - ``Diamond outline`` -- Objects are present in the collection.
+         - ``highlight`` -- One or more objects are selected in this collection.
+         - ``Filled diamond`` -- All objects are selected in this collection.
+         - ``small dot and greyed out`` -- No objects can be selected in this collection (the collection is hidden or marked as not selectable or all objects are marked as not selectable, etc.)  *Note: The button isn't disabled to allow selecting subcollections; however, if you left click on it it will deselect all objects.*
+
+         .. hint::
+
+            If you try to select all the objects in the collection but the diamond doesn't fill, that means you have one or more unselectable objects in the collection.
+
+   Set Object (multiple icons)
+      - :kbd:`LMB` -- Move selected object(s) to collection.
+      - :kbd:`Shift-LMB` -- Add/Remove selected object(s) to/from collection.
+
+      Icons are used to show the object/selection state:
+         - ``Grid`` -- No objects are present in this collection.
+         - ``Box outline`` -- Objects are present, but none are selected in this collection.
+         - ``3 boxes with dashed outline`` -- The collection contains objects that are selected, but does not contain the active object in the selection.
+         - ``Filled box`` -- The collection contains the active object in the selection.
+
+         .. note::
+
+            The active object must also be selected to be indicated/moved.
+
+            If no objects are selected the button is disabled.
+
+
    Global Restrictions (checkbox, cursor, eye, screen, camera, holdout, indirect only icons)
       See the Outliner page for information about
       :ref:`Restrictions <editors-outliner-interface-restriction_columns>`.
@@ -86,8 +127,8 @@
       - :kbd:`Shift-LMB` -- Invert the restriction state on all collections.
       - :kbd:`Shift-Ctrl-LMB` -- Isolate collections with selected objects.
       - :kbd:`Shift-Alt-LMB` -- Disable collections with selected objects.
-      - :kbd:`Ctrl-LMB` -- Copy/paste the restriction state on all collections.
-      - :kbd:`Ctrl-Alt-LMB` -- Swap the restriction state on all collections with that of another restriction.
+      - :kbd:`Ctrl-LMB` -- Copy/paste the restriction state on all collections.  Click on an RTO to copy the restriction state, then click on another RTO to paste it.
+      - :kbd:`Ctrl-Alt-LMB` -- Swap the restriction state on all collections with that of another restriction.  Click on an RTO to copy the restriction state, then click on another RTO to swap the two.
       - :kbd:`Alt-LMB` -- Discard the previous state, and anything that has been stored for Copy/Paste or Swap.
 
 Tree View
@@ -109,10 +150,25 @@
    Name
       Double :kbd:`LMB`-click to rename the collection.
 
-   Set Object (box icon)
-      - :kbd:`LMB` -- Move object(s) to collection.
-      - :kbd:`Shift-LMB` -- Add/Remove object(s) to/from collection.
+   Select All Objects in the Collection (multiple icons)
+      - :kbd:`LMB` -- Select all of the objects in the collection (deselects all other objects).
+      - :kbd:`Shift-LMB` -- Add/Remove all of the objects in the collection to/from the selection.
+      - :kbd:`Ctrl-LMB` -- Select all of the objects in the collection and all of its subcollections (deselects all other objects).
+      - :kbd:`Ctrl-Shift-LMB` -- Add/Remove all of the objects in the collection and all of its subcollections to/from the selection.
 
+      .. note::
+
+         See the section in the Scene Collection for more details.
+
+
+   Set Object (multiple icons)
+      - :kbd:`LMB` -- Move selected object(s) to collection.
+      - :kbd:`Shift-LMB` -- Add/Remove selected object(s) to/from collection.
+
+      .. note::
+
+         See the section in the Scene Collection for more details.
+
    Local Restrictions (checkbox, cursor, eye, screen, camera, holdout, indirect only icons)
       - :kbd:`LMB` -- Toggle the collection's restriction on/off.
       - :kbd:`Shift-LMB` -- Isolate the collection's restriction, preserving parents if need be.

Modified: trunk/blender_docs/manual/files/media/image_formats.rst
===================================================================
--- trunk/blender_docs/manual/files/media/image_formats.rst	2021-05-23 01:24:40 UTC (rev 8072)
+++ trunk/blender_docs/manual/files/media/image_formats.rst	2021-05-23 01:33:17 UTC (rev 8073)
@@ -120,7 +120,7 @@
 Detect Sequences
    Automatically looks for image sequences in the selected images (based on the file name).
    Disable this when you do want to get single images that are part of a sequence.
-   Detect UDIMs
+Detect UDIMs
    Automatically looks for :doc:`UDIM </modeling/meshes/uv/workflows/udims>`
    tiles in the directory of the selected image; if matches are found they are loaded into Blender as UDIMs.
    This works by detecting if the filename has a ``.xxxx`` (four digit number) before the file extension.

Modified: trunk/blender_docs/manual/images/addons_interface_collection-manager_popup.png
===================================================================
(Binary files differ)

