[Bf-docboard-svn] bf-manual: [8089] trunk/blender_docs/manual: Merge branch 'blender-2.93-release'
Aaron Carlisle
noreply at blender.org
Tue May 25 23:14:03 CEST 2021
Revision: 8089
https://developer.blender.org/rBM8089
Author: Blendify
Date: 2021-05-25 23:14:03 +0200 (Tue, 25 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/editors/image/editing.rst
trunk/blender_docs/manual/editors/outliner/editing.rst
trunk/blender_docs/manual/editors/outliner/interface.rst
trunk/blender_docs/manual/editors/preferences/experimental.rst
trunk/blender_docs/manual/files/blend/open_save.rst
trunk/blender_docs/manual/files/linked_libraries/library_overrides.rst
trunk/blender_docs/manual/files/media/image_formats.rst
trunk/blender_docs/manual/interface/controls/nodes/parts.rst
trunk/blender_docs/manual/interface/controls/nodes/sidebar.rst
trunk/blender_docs/manual/interface/window_system/topbar.rst
trunk/blender_docs/manual/movie_clip/tracking/clip/editing/track.rst
trunk/blender_docs/manual/movie_clip/tracking/clip/sidebar/track/marker.rst
trunk/blender_docs/manual/render/color_management.rst
trunk/blender_docs/manual/scene_layout/object/editing/link_transfer/transfer_mesh_data.rst
trunk/blender_docs/manual/sculpt_paint/sculpting/editing/sculpt.rst
trunk/blender_docs/manual/video_editing/sequencer/strips/movie_image.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-05-25 21:07:49 UTC (rev 8088)
+++ trunk/blender_docs 2021-05-25 21:14:03 UTC (rev 8089)
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-8072
\ No newline at end of property
+/branches/blender-2.93-release/blender_docs:7959-8088
\ 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-25 21:07:49 UTC (rev 8088)
+++ trunk/blender_docs/manual/addons/interface/collection_manager.rst 2021-05-25 21:14:03 UTC (rev 8089)
@@ -60,7 +60,7 @@
.. note::
- Clears any in progress copy/swap actions.
+ Clears any in progress copy or swap actions.
Redo
Redoes the previously undone action.
@@ -85,47 +85,49 @@
This is static and can't be edited.
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
+ - :kbd:`LMB` -- Select all objects in the collection (deselects all other objects).
+ - :kbd:`Shift-LMB` -- Add/Remove all objects in the collection to/from the selection.
+ - :kbd:`Ctrl-LMB` -- Select all objects in the collection and all of its subcollections
(deselects all other objects).
- - :kbd:`Shift-Ctrl-LMB` -- Add/Remove all of the objects in the collection and all of its
- subcollections to/from the selection.
+ - :kbd:`Shift-Ctrl-LMB` -- Add/Remove all objects in the collection
+ and all 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.*
+ Icons and button highlights are used to show the selection state
- .. hint::
+ - ``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 :kbd:`LMB` click on
+ it it will deselect all objects.
- 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.
+ .. 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::
+ - ``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.
- The active object must also be selected to be indicated/moved.
+ .. note::
- If no objects are selected the button is disabled.
+ 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>`.
@@ -135,7 +137,8 @@
- :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.
- Click on an RTO to copy the restriction state, then click on another RTO to paste it.
+ 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.
@@ -160,12 +163,12 @@
Double :kbd:`LMB`-click to rename the 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
+ - :kbd:`LMB` -- Select all objects in the collection (deselects all other objects).
+ - :kbd:`Shift-LMB` -- Add/Remove all objects in the collection to/from the selection.
+ - :kbd:`Ctrl-LMB` -- Select all objects in the collection and all of its subcollections
(deselects all other objects).
- - :kbd:`Shift-Ctrl-LMB` -- Add/Remove all of the objects in the collection and all of its
- subcollections to/from the selection.
+ - :kbd:`Ctrl-Shift-LMB` -- Add/Remove all objects in the collection
+ and all its subcollections to/from the selection.
.. note::
Modified: trunk/blender_docs/manual/editors/image/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/image/editing.rst 2021-05-25 21:07:49 UTC (rev 8088)
+++ trunk/blender_docs/manual/editors/image/editing.rst 2021-05-25 21:14:03 UTC (rev 8089)
@@ -90,8 +90,7 @@
:class: refbox
:Mode: All Modes
- :Menu: :menuselection:`Image --> Reload`
- :Shortcut: :kbd:`Alt-R`
+ :Menu: :menuselection:`Image --> Edit Externally`
Using the *Edit Externally* tool Blender will open an external image editor,
as specified in the *Preferences* and load in the image to be edited.
@@ -106,7 +105,7 @@
:class: refbox
:Mode: All Modes
- :Menu: :menuselection:`Image --> Reload`
+ :Menu: :menuselection:`Image --> Save`
:Shortcut: :kbd:`Alt-S`
Save the image, if the image is already a file.
@@ -172,7 +171,7 @@
Invert Image Colors
Invert the colors of an image.
Invert Channel
- Red, Green, Blue, AlphaSave Buffers
+ Red, Green, Blue, Alpha
.. _bpy.ops.image.resize:
@@ -205,8 +204,8 @@
this can make an image more visually appealing or highlight some visual flaw.
Horizontally
- Mirrors the image so the left-side becomes the right-side.
-Virtically
+ Mirrors the image so the left side becomes the right side.
+Vertically
Mirrors the image so the top becomes the bottom.
Modified: trunk/blender_docs/manual/editors/outliner/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/outliner/editing.rst 2021-05-25 21:07:49 UTC (rev 8088)
+++ trunk/blender_docs/manual/editors/outliner/editing.rst 2021-05-25 21:14:03 UTC (rev 8089)
@@ -164,9 +164,17 @@
The view menu is part of the context menu and supported in all the Outliner elements.
+.. _bpy.ops.outliner.show_active:
+
Show Active :kbd:`Period`
Centers the Tree View to selected object.
+
+.. _bpy.ops.outliner.show_hierarchy:
+
Show Hierarchy :kbd:`Home`
To collapse all levels of the tree.
+
+.. _bpy.ops.outliner.show_one_level:
+
Show/Hide One Level :kbd:`NumpadPlus`/ :kbd:`NumpadMinus`
Expand one level down in the tree or collapse one level using the keyboard shortcuts.
Modified: trunk/blender_docs/manual/editors/outliner/interface.rst
===================================================================
--- trunk/blender_docs/manual/editors/outliner/interface.rst 2021-05-25 21:07:49 UTC (rev 8088)
+++ trunk/blender_docs/manual/editors/outliner/interface.rst 2021-05-25 21:14:03 UTC (rev 8089)
@@ -3,83 +3,11 @@
Interface
*********
-Object Mode
-===========
-
-The far left of the Outliner contains a region to toggle the current :doc:`Object Mode </editors/3dview/modes>`.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list