From 7a371a0be5b3c9be0a3b736b986519dc208f36cf Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Fri, 6 Oct 2023 16:08:16 +0200 Subject: [PATCH 1/3] add docs --- .../armatures/posing/editing/pose_library.rst | 18 +++++----- manual/editors/asset_shelf.rst | 36 +++++++++++++++++++ manual/editors/index.rst | 1 + ...browser-pose_library-use_from_viewport.png | 4 +-- manual/images/asset_shelf-options.png | 3 ++ manual/images/asset_shelf-tabs.png | 3 ++ 6 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 manual/editors/asset_shelf.rst create mode 100644 manual/images/asset_shelf-options.png create mode 100644 manual/images/asset_shelf-tabs.png diff --git a/manual/animation/armatures/posing/editing/pose_library.rst b/manual/animation/armatures/posing/editing/pose_library.rst index cc93f35f9..a58c1d8f6 100644 --- a/manual/animation/armatures/posing/editing/pose_library.rst +++ b/manual/animation/armatures/posing/editing/pose_library.rst @@ -253,12 +253,15 @@ Use from 3D Viewport .. figure:: /images/asset_browser-pose_library-use_from_viewport.png - The pose library as a side-panel of the 3D Viewport. + The pose library in use from the Asset Shelf. -The Sidebar of the 3D Viewport 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 interaction. +.. note:: + + The pose library previously lived in the Sidebar within the Pose Library panel. + The panel still exists, but now contains a button to open the asset shelf. + +In the 3D viewport, poses can be quickly applied from the Asset Shelf. +Contrary to the Asset Browser, the shelf allows you to apply poses quicker. **Click on a pose to apply it.** A single click is enough. You can also select and apply a pose via the cursor keys. @@ -268,10 +271,7 @@ to directly see the result on the active character. **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 :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 field into view. +For additional features of the Asset Shelf refer to its :doc:`documentation `. .. _pose-library-old: diff --git a/manual/editors/asset_shelf.rst b/manual/editors/asset_shelf.rst new file mode 100644 index 000000000..949cebd27 --- /dev/null +++ b/manual/editors/asset_shelf.rst @@ -0,0 +1,36 @@ + +*********** +Asset Shelf +*********** + +Search +====== + +To search for assets, hover your mouse over the Asset Shelf, then press Ctrl-F and type a search query. +This will filter the poses to match what you typed. + + +Tabs +==== + +.. figure:: /images/asset_shelf-tabs.png + + The usage of catalogs as tabs. + +Catalogs can be shown as individual tabs. Each tab will only show its content, and the content of its children. +That makes it easy to filter down to a certain set of assets. + + +Display Options +=============== + +.. figure:: /images/asset_shelf-options.png + + Display options available for the asset shelf. + +It is possible to change the size of items on the shelf by using the size property. + +By toggling on the "Names" checkbox, the asset names will be shown in the shelf. Alternatively it is also +possible to hover over an item to show its name. + +By default the shelf only has a height for one item row. To allow for more rows, drag it on the upper edge to increase its size. diff --git a/manual/editors/index.rst b/manual/editors/index.rst index 584fe5842..c16645657 100644 --- a/manual/editors/index.rst +++ b/manual/editors/index.rst @@ -70,5 +70,6 @@ See :doc:`User Interface ` for documentation on the general in properties_editor.rst file_browser.rst asset_browser.rst + asset_shelf.rst spreadsheet.rst preferences/index.rst diff --git a/manual/images/asset_browser-pose_library-use_from_viewport.png b/manual/images/asset_browser-pose_library-use_from_viewport.png index 1a0a74948..9aa398566 100644 --- a/manual/images/asset_browser-pose_library-use_from_viewport.png +++ b/manual/images/asset_browser-pose_library-use_from_viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbb95e670c60f41f13006fa2693c1eb9e5795fbaa2584f1b581244cc8f7e40a8 -size 539949 +oid sha256:989cdffbb30ed1123811bc9a71dde6cadce7605791d4567997864deea5f4cba3 +size 1791403 diff --git a/manual/images/asset_shelf-options.png b/manual/images/asset_shelf-options.png new file mode 100644 index 000000000..470d54d28 --- /dev/null +++ b/manual/images/asset_shelf-options.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3b74c0e7a37538ed8f5470e28a621bae6f738bbc82fbef79704a98e63cd2228 +size 5515 diff --git a/manual/images/asset_shelf-tabs.png b/manual/images/asset_shelf-tabs.png new file mode 100644 index 000000000..1cb8ab568 --- /dev/null +++ b/manual/images/asset_shelf-tabs.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffa346f78f44c4a9b69e4211951a64a2247c6ed77b39954f0b59478564c4a389 +size 9125 -- 2.30.2 From 250ab3878c3976fdc87fab2a9dbe4eaf4c55610a Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Tue, 10 Oct 2023 10:58:03 +0200 Subject: [PATCH 2/3] change location of link to asset shelf --- manual/animation/armatures/posing/editing/pose_library.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manual/animation/armatures/posing/editing/pose_library.rst b/manual/animation/armatures/posing/editing/pose_library.rst index a58c1d8f6..8f7ad3b44 100644 --- a/manual/animation/armatures/posing/editing/pose_library.rst +++ b/manual/animation/armatures/posing/editing/pose_library.rst @@ -260,7 +260,7 @@ Use from 3D Viewport The pose library previously lived in the Sidebar within the Pose Library panel. The panel still exists, but now contains a button to open the asset shelf. -In the 3D viewport, poses can be quickly applied from the Asset Shelf. +In the 3D viewport, poses can be quickly applied from the :doc:`Asset Shelf. ` Contrary to the Asset Browser, the shelf allows you to apply poses quicker. **Click on a pose to apply it.** A single click is enough. @@ -271,8 +271,6 @@ to directly see the result on the active character. **Drag the pose thumbnail left to right to blend it** into the character's current pose. Just release the mouse button to confirm. -For additional features of the Asset Shelf refer to its :doc:`documentation `. - .. _pose-library-old: -- 2.30.2 From b76b96d27f6bac6778dc02ed3a63b19d06888121 Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Tue, 17 Oct 2023 14:30:24 +0200 Subject: [PATCH 3/3] move asset shelf to regions.rst --- .../armatures/posing/editing/pose_library.rst | 2 +- manual/editors/asset_shelf.rst | 36 ----------------- manual/editors/index.rst | 1 - manual/interface/window_system/regions.rst | 39 +++++++++++++++++++ 4 files changed, 40 insertions(+), 38 deletions(-) delete mode 100644 manual/editors/asset_shelf.rst diff --git a/manual/animation/armatures/posing/editing/pose_library.rst b/manual/animation/armatures/posing/editing/pose_library.rst index 8f7ad3b44..fe26b89e8 100644 --- a/manual/animation/armatures/posing/editing/pose_library.rst +++ b/manual/animation/armatures/posing/editing/pose_library.rst @@ -260,7 +260,7 @@ Use from 3D Viewport The pose library previously lived in the Sidebar within the Pose Library panel. The panel still exists, but now contains a button to open the asset shelf. -In the 3D viewport, poses can be quickly applied from the :doc:`Asset Shelf. ` +In the 3D viewport, poses can be quickly applied from the :ref:`ui-region-asset_shelf`. Contrary to the Asset Browser, the shelf allows you to apply poses quicker. **Click on a pose to apply it.** A single click is enough. diff --git a/manual/editors/asset_shelf.rst b/manual/editors/asset_shelf.rst deleted file mode 100644 index 949cebd27..000000000 --- a/manual/editors/asset_shelf.rst +++ /dev/null @@ -1,36 +0,0 @@ - -*********** -Asset Shelf -*********** - -Search -====== - -To search for assets, hover your mouse over the Asset Shelf, then press Ctrl-F and type a search query. -This will filter the poses to match what you typed. - - -Tabs -==== - -.. figure:: /images/asset_shelf-tabs.png - - The usage of catalogs as tabs. - -Catalogs can be shown as individual tabs. Each tab will only show its content, and the content of its children. -That makes it easy to filter down to a certain set of assets. - - -Display Options -=============== - -.. figure:: /images/asset_shelf-options.png - - Display options available for the asset shelf. - -It is possible to change the size of items on the shelf by using the size property. - -By toggling on the "Names" checkbox, the asset names will be shown in the shelf. Alternatively it is also -possible to hover over an item to show its name. - -By default the shelf only has a height for one item row. To allow for more rows, drag it on the upper edge to increase its size. diff --git a/manual/editors/index.rst b/manual/editors/index.rst index c16645657..584fe5842 100644 --- a/manual/editors/index.rst +++ b/manual/editors/index.rst @@ -70,6 +70,5 @@ See :doc:`User Interface ` for documentation on the general in properties_editor.rst file_browser.rst asset_browser.rst - asset_shelf.rst spreadsheet.rst preferences/index.rst diff --git a/manual/interface/window_system/regions.rst b/manual/interface/window_system/regions.rst index a7c5b769c..b9ebd308b 100644 --- a/manual/interface/window_system/regions.rst +++ b/manual/interface/window_system/regions.rst @@ -170,3 +170,42 @@ Scaling The scale of certain regions (such as the Toolbar) can be changed by dragging inside them with :kbd:`Ctrl-MMB`, or using :kbd:`NumpadPlus` and :kbd:`NumpadMinus` while hovering the mouse cursor over them. Press :kbd:`Home` to reset the scale to the default. + + +.. _ui-region-asset_shelf: + +Asset Shelf +=========== + +Search +------ + +To search for assets, hover your mouse over the Asset Shelf, then press Ctrl-F and type a search query. +This will filter the poses to match what you typed. + + +Tabs +---- + +.. figure:: /images/asset_shelf-tabs.png + + The usage of catalogs as tabs. + +Catalogs can be shown as individual tabs. Each tab will only show its content, and the content of its children. +That makes it easy to filter down to a certain set of assets. + + +Display Options +--------------- + +.. figure:: /images/asset_shelf-options.png + + Display options available for the asset shelf. + +It is possible to change the size of items on the shelf by using the size property. + +By toggling on the "Names" checkbox, the asset names will be shown in the shelf. Alternatively it is also +possible to hover over an item to show its name. + +By default the shelf only has a height for one item row. To allow for more rows, drag it on the upper edge to increase its size. + -- 2.30.2