[Bf-docboard-svn] bf-manual: [8697] branches/blender-3.0-release/blender_docs/manual: Merge recent Asset Browser commits from trunk to 3.0-release branch
Sybren A. Stüvel
noreply at blender.org
Fri Nov 26 17:32:34 CET 2021
Revision: 8697
https://developer.blender.org/rBM8697
Author: sybren
Date: 2021-11-26 17:32:34 +0100 (Fri, 26 Nov 2021)
Log Message:
-----------
Merge recent Asset Browser commits from trunk to 3.0-release branch
Merge rBM8688, rBM8689, rBM8690, rBM8691, rBM8692, rBM8693, rBM8694,
rBM8695, rBM8696 into the Blender 3.0 release branch. Those commits
should have gone there in the first place.
Modified Paths:
--------------
branches/blender-3.0-release/blender_docs/manual/addons/object/edit_linked_library.rst
branches/blender-3.0-release/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst
branches/blender-3.0-release/blender_docs/manual/animation/armatures/properties/pose_library.rst
branches/blender-3.0-release/blender_docs/manual/animation/constraints/relationship/action.rst
branches/blender-3.0-release/blender_docs/manual/animation/keyframes/keying_sets.rst
branches/blender-3.0-release/blender_docs/manual/animation/markers.rst
branches/blender-3.0-release/blender_docs/manual/editors/asset_browser.rst
branches/blender-3.0-release/blender_docs/manual/editors/preferences/file_paths.rst
branches/blender-3.0-release/blender_docs/manual/files/asset_libraries/introduction.rst
branches/blender-3.0-release/blender_docs/manual/files/data_blocks.rst
branches/blender-3.0-release/blender_docs/manual/files/linked_libraries/index.rst
branches/blender-3.0-release/blender_docs/manual/glossary/index.rst
branches/blender-3.0-release/blender_docs/manual/images/asset_browser-asset_library_preferences.png
branches/blender-3.0-release/blender_docs/manual/images/asset_browser-gold-material.png
branches/blender-3.0-release/blender_docs/manual/images/editors_preferences_section_file-paths.png
branches/blender-3.0-release/blender_docs/manual/scene_layout/object/editing/asset.rst
Removed Paths:
-------------
branches/blender-3.0-release/blender_docs/manual/files/linked_libraries/assets.rst
Property Changed:
----------------
branches/blender-3.0-release/blender_docs/
Index: branches/blender-3.0-release/blender_docs
===================================================================
--- branches/blender-3.0-release/blender_docs 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs 2021-11-26 16:32:34 UTC (rev 8697)
Property changes on: branches/blender-3.0-release/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/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:8641-8642
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8641-8642
+/trunk/blender_docs:8688-8696
\ No newline at end of property
Modified: branches/blender-3.0-release/blender_docs/manual/addons/object/edit_linked_library.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/addons/object/edit_linked_library.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/addons/object/edit_linked_library.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -3,7 +3,7 @@
Edit Linked Library
*******************
-When working in larger projects that involve scenes with assets linked from a blend-file library,
+When working in larger projects that involve scenes with :doc:`/files/data_blocks` linked from a blend-file library,
it can get very time-consuming to save your current scene, track down the proper linked blend-file,
make your modifications, save, and return to your original scene file.
This add-on allows you to accomplish this process with only a pair of mouse clicks
Modified: branches/blender-3.0-release/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -242,6 +242,7 @@
used in the pose. This can be used to create a selection set, or simply to
remind yourself what was part of the pose and what wasn’t.
+.. _pose-library-from-viewport:
Use from 3D Viewport
--------------------
@@ -250,7 +251,7 @@
The pose library as a side-panel of the 3D Viewport.
-The right-hand panel of the 3D Viewport (toggle it with the N key) has a **Pose
+The right-hand panel of the 3D Viewport (toggle it with the :kbd:`N` key) has a **Pose
Library panel in the Animations tab**. Contrary to the Asset Browser, which can
be used for different asset types and also for some asset management tasks, this
panel is dedicated to applying poses. This means that it can allow faster
@@ -265,19 +266,27 @@
**Drag the pose thumbnail left to right to blend it** into the character's
current pose. Just release the mouse button to confirm.
-To search for poses, hover your mouse over the poses, then press Ctrl+F and type
-a search query. This will filter the poses to match what you typed.
+To **search for poses**, hover your mouse over the poses, then press
+:kbd:`Ctrl-F` and type a search query. This will filter the poses to match what
+you typed. The scrollable area will automatically scroll the search box into
+view.
+.. _pose-library-old:
+
Old Pose Library
================
-The Asset Browser based pose library, described above, was introduced in Blender
-3.0. It replaces the old pose library, which was introduced in Blender 2.46.
-This section describes the old pose library, including how to convert poses to
-the new system. The old pose library will be removed in a future release
-(potentially 3.1, but this has yet to be decided).
+The Asset Browser based pose library, described above, replaces the old pose
+library. This section describes that old pose library, including how to convert
+poses to the new system.
+.. warning::
+ The old pose library is deprecated in Blender 3.0, and will be mostly removed
+ Blender 3.1. Only the Python interface will remain a bit longer, and be
+ removed in Blender 3.2. The necessary functionality to convert old pose
+ libraries to pose assets will remain in Blender for the forseeable future.
+
.. reference::
:Mode: Pose Mode
Modified: branches/blender-3.0-release/blender_docs/manual/animation/armatures/properties/pose_library.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/animation/armatures/properties/pose_library.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/animation/armatures/properties/pose_library.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -9,7 +9,7 @@
:Panel: :menuselection:`Properties --> Object Data Properties --> Pose Library`
.. warning::
- This properties panel is obsolete and will be removed in a future release.
+ This properties panel is obsolete and will be removed in Blender 3.1.
The :doc:`Asset Browser based pose library </animation/armatures/posing/editing/pose_library>`
was introduced in Blender 3.0 and replaces this pose library panel.
Modified: branches/blender-3.0-release/blender_docs/manual/animation/constraints/relationship/action.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/animation/constraints/relationship/action.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/animation/constraints/relationship/action.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -161,8 +161,8 @@
(e.g. if the constrained bone is named "arm", it will use and only use the action's bone channel named "arm"...).
Unfortunately, using a *Pose* action on a whole armature object
(to affect all the keyed bones in the action at once) will not work...
-- Note also that you can use the :doc:`pose library feature </animation/armatures/properties/pose_library>` to
- create/edit a *Pose* action data-block... just remember that in this situation, there is one pose per frame!
+- Actions can also be marked as :term:`Asset`, but with certain limitations. For more info, see
+ :doc:`</animation/armatures/posing/editing/pose_library>`.
Example
Modified: branches/blender-3.0-release/blender_docs/manual/animation/keyframes/keying_sets.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/animation/keyframes/keying_sets.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/animation/keyframes/keying_sets.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -125,8 +125,8 @@
==========================
The built-in *Whole Character* keying set is made to keyframe all properties
-that are likely to get animated in a character rig. It is also implicitly used by
-the :doc:`Pose Library system </animation/armatures/properties/pose_library>`.
+that are likely to get animated in a character rig. It was also implicitly used by
+the :ref:`Old Pose Library system <pose-library-old>`.
In order to determine which bones to add keys for, and which bones to skip,
the keying set uses the bone names. The following bone name prefixes will be skipped:
Modified: branches/blender-3.0-release/blender_docs/manual/animation/markers.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/animation/markers.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/animation/markers.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -107,7 +107,7 @@
------------
If *Show Pose Markers* is checked, a pose marker and
-a new pose in the :doc:`Pose Library </animation/armatures/properties/pose_library>` are added.
+a new pose in the :ref:`Old Pose Library <pose-library-old>` are added.
Selecting
Modified: branches/blender-3.0-release/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/editors/asset_browser.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/editors/asset_browser.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -4,20 +4,30 @@
Asset Browser
*************
-This section describes the *Asset Browser*. For general information on Blender's
-asset library system, how to :ref:`create <asset-create>` and :ref:`edit <asset-edit>`
-assets, and design choices, see :doc:`/files/asset_libraries/index`.
+This section describes the *Asset Browser*, which is the main interface for
+organising and using assets.
-*The Asset Browser was introduced in Blender 3.0, and will be improved and
-expanded over multiple subsequent releases.*
+The Asset Browser was introduced in Blender 3.0, and will be improved and
+expanded over multiple subsequent releases.
+.. seealso::
+ :doc:`/files/asset_libraries/index`
+ for general information on Blender's asset library system, including how to :ref:`create <asset-create>` and :ref:`edit <asset-edit>` assets, and design choices.
+
+ :doc:`/files/asset_libraries/catalogs`
+ for organizing assets.
+
+ :doc:`/animation/armatures/posing/editing/pose_library`
+ build on top of the Asset Browser.
+
+
Interface
=========
.. figure:: /images/asset_browser-gold-material.png
- Asset Browser, showing materials in a small asset library.
+ Asset Browser, showing materials in an asset library.
Main Region
Modified: branches/blender-3.0-release/blender_docs/manual/editors/preferences/file_paths.rst
===================================================================
--- branches/blender-3.0-release/blender_docs/manual/editors/preferences/file_paths.rst 2021-11-26 16:03:31 UTC (rev 8696)
+++ branches/blender-3.0-release/blender_docs/manual/editors/preferences/file_paths.rst 2021-11-26 16:32:34 UTC (rev 8697)
@@ -100,9 +100,20 @@
Asset Libraries
===============
-Todo Asset Browsing.
+Name and on-disk directory paths of Asset Libraries. To make Blender aware of an
+asset library, add it to this list. The name is for your reference only, and
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list