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

[Aaron Carlisle]

Revision: 9313
          https://developer.blender.org/rBM9313
Author:   Blendify
Date:     2022-05-28 04:00:24 +0200 (Sat, 28 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/animation/markers.rst
    trunk/blender_docs/manual/editors/asset_browser.rst
    trunk/blender_docs/manual/files/import_export/obj.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-28 01:59:44 UTC (rev 9312)
+++ trunk/blender_docs	2022-05-28 02:00:24 UTC (rev 9313)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/blender-2.93-release/blender_docs:7959-8113
 /branches/blender-3.0-release/blender_docs:8543-9034
 /branches/blender-3.1-release/blender_docs:8904-9230
-/branches/blender-3.2-release/blender_docs:9236-9308
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9312
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/markers.rst
===================================================================
--- trunk/blender_docs/manual/animation/markers.rst	2022-05-28 01:59:44 UTC (rev 9312)
+++ trunk/blender_docs/manual/animation/markers.rst	2022-05-28 02:00:24 UTC (rev 9313)
@@ -221,6 +221,33 @@
 the markers will move in steps corresponding to 1 second (according to the scene's *FPS*).
 
 
+Select
+------
+
+.. reference::
+
+   :Mode:      All modes
+   :Menu:      :menuselection:`Marker --> Select`
+
+Convenient operators for selecting Marks; see :ref:`bpy.ops.marker.select` for more information on selecting Markers.
+
+.. _bpy.ops.marker.select_all:
+
+All :kbd:`A`
+   Selects all Markers.
+None :kbd:`Ctrl-A`
+   Un-selects any already selected Markers.
+Invert :kbd:`Ctrl-I`
+   Select all un-selected Markers and unselects all selected Markers.
+
+.. _bpy.ops.marker.select_leftright:
+
+Before Current Frame
+   Selects all Markers to the left of the current frame and the Marker on the current frame if it exists.
+After Current Frame
+   Selects all Markers to the Right of the current frame and the Marker on the current frame if it exists.
+
+
 .. _bpy.types.SpaceDopeSheetEditor.show_pose_markers:
 
 Show Pose Markers

Modified: trunk/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst	2022-05-28 01:59:44 UTC (rev 9312)
+++ trunk/blender_docs/manual/editors/asset_browser.rst	2022-05-28 02:00:24 UTC (rev 9313)
@@ -202,6 +202,13 @@
    Since the file now has its own copy of the asset, later changes to
    the asset file will not be reflected in the file it's appended to.
 
+Instancing Collections
+   *Mimics the Instance Collections option when appending*
+
+   Some asset types such as collections can be created as an instanced collection.
+   This is done by selecting the *Instance* option when dragging collection assets into the 3D Viewport.
+   By selecting this option the an empty object is added and creates an instance of the collection.
+
 Note that all regular Blender operations are available after the asset has been added to the current file.
 For example, you could choose to link an object to the scene; this will also link its mesh and its materials.
 Then you can make the object itself local

Modified: trunk/blender_docs/manual/files/import_export/obj.rst
===================================================================
--- trunk/blender_docs/manual/files/import_export/obj.rst	2022-05-28 01:59:44 UTC (rev 9312)
+++ trunk/blender_docs/manual/files/import_export/obj.rst	2022-05-28 02:00:24 UTC (rev 9313)
@@ -63,8 +63,22 @@
 
    :Viewport: Use viewport properties.
    :Render: Use final render properties.
+Path Mode
+   When referencing paths in exported files you may want some control as to the method used since absolute paths
+   may only be correct on your own system. Relative paths, on the other hand, are more portable
+   but mean that you have to keep your files grouped when moving about on your local file system.
+   In some cases, the path doesn't matter since the target application will search
+   a set of predefined paths anyway so you have the option to strip the path too.
 
+   :Auto: Uses relative paths for files which are in a subdirectory of the exported location,
+          absolute for any directories outside that.
+   :Absolute: Uses full paths.
+   :Relative: Uses relative paths in every case (except when on a different drive on Windows).
+   :Match: Uses relative / absolute paths based on the paths used in Blender.
+   :Strip Path: Only write the filename and omit the path component.
+   :Copy: Copy the file on exporting and reference it with a relative path.
 
+
 Geometry Export
 ^^^^^^^^^^^^^^^