[Bf-docboard-svn] bf-manual: [8706] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Aaron Carlisle
noreply at blender.org
Sat Nov 27 04:56:28 CET 2021
Revision: 8706
https://developer.blender.org/rBM8706
Author: Blendify
Date: 2021-11-27 04:56:27 +0100 (Sat, 27 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst
trunk/blender_docs/manual/editors/asset_browser.rst
trunk/blender_docs/manual/editors/video_sequencer/sequencer/display.rst
trunk/blender_docs/manual/interface/window_system/regions.rst
trunk/blender_docs/manual/video_editing/sequencer/strips/image.rst
trunk/blender_docs/manual/video_editing/sequencer/strips/movie.rst
Added Paths:
-----------
trunk/blender_docs/manual/images/asset-browser-preview-panel.png
trunk/blender_docs/manual/images/asset_browser-clear-asset.png
trunk/blender_docs/manual/images/interface_window-system_regions_scrollbar_widget.png
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs 2021-11-27 03:56:27 UTC (rev 8706)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
/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:8543-8686
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8705
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst
===================================================================
--- trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs/manual/animation/armatures/posing/editing/pose_library.rst 2021-11-27 03:56:27 UTC (rev 8706)
@@ -163,7 +163,8 @@
Controlling the Look of Preview Images
---------------------------------------
-The preview images are rendered with the active :ref:`Scene camera <bpy.types.Scene.camera>`.
+The pose library preview images are rendered with the active
+:ref:`Scene camera <bpy.types.Scene.camera>`.
This approach was preferred over rendering a specific 3D Viewport for two main
reasons:
Modified: trunk/blender_docs/manual/editors/asset_browser.rst
===================================================================
--- trunk/blender_docs/manual/editors/asset_browser.rst 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs/manual/editors/asset_browser.rst 2021-11-27 03:56:27 UTC (rev 8706)
@@ -216,10 +216,20 @@
Asset Previews
==============
+.. figure:: /images/asset-browser-preview-panel.png
+ :align: right
+
+ Preview panel in the Asset Browser.
+
Preview images are typically automatically generated when you
:ref:`mark a data-block as asset <bpy.ops.asset.mark>`.
+It's also possible to load image files from disk, to replace the auto-generated
+previews.
+For previews of pose assets, see :ref:`poselib-preview-images`.
+
+
.. _asset-bundles:
Asset Bundles
Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/display.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/display.rst 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/display.rst 2021-11-27 03:56:27 UTC (rev 8706)
@@ -37,6 +37,18 @@
F-Curves
Show animation curves for opacity and volume values as darkened sections of the strip.
+.. _bpy.types.SequencerTimelineOverlay.show_thumbnails:
+
+Thumbnails
+ Displays a preview of the strip contents overtop the strip for Movie and Image strips.
+ To draw thumbnails, this overlay has to be enabled and the strip's height must be tall enough.
+ See the :ref:`User Interface <interface_window-system_regions_scroll_range>`
+ documentation on how to adjust the height of strips.
+
+ The larger the strip's height the bigger the thumbnails are displayed.
+ The number of thumbnails displayed depends on the thumbnail size
+ and the strip length (which depends on the zoom level).
+
.. _bpy.types.SequencerTimelineOverlay.show_grid:
Grid
Copied: trunk/blender_docs/manual/images/asset-browser-preview-panel.png (from rev 8705, branches/blender-3.0-release/blender_docs/manual/images/asset-browser-preview-panel.png)
===================================================================
(Binary files differ)
Copied: trunk/blender_docs/manual/images/asset_browser-clear-asset.png (from rev 8705, branches/blender-3.0-release/blender_docs/manual/images/asset_browser-clear-asset.png)
===================================================================
(Binary files differ)
Copied: trunk/blender_docs/manual/images/interface_window-system_regions_scrollbar_widget.png (from rev 8705, branches/blender-3.0-release/blender_docs/manual/images/interface_window-system_regions_scrollbar_widget.png)
===================================================================
(Binary files differ)
Modified: trunk/blender_docs/manual/interface/window_system/regions.rst
===================================================================
--- trunk/blender_docs/manual/interface/window_system/regions.rst 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs/manual/interface/window_system/regions.rst 2021-11-27 03:56:27 UTC (rev 8706)
@@ -131,7 +131,21 @@
If the region has no zoom level, it can be scrolled by using the :kbd:`Wheel`,
while the mouse hovers over it.
+.. _interface_window-system_regions_scroll_range:
+Some regions, in particular animation timelines have scroll bars with added control points
+to adjust the vertical or horizontal range of the region.
+These special scroll bars will have added widgets at the ends, as shown in the image below:
+
+.. figure:: /images/interface_window-system_regions_scrollbar_widget.png
+ :align: center
+
+This can be used to stretch or compress the range to show more or less detail within the available screen space.
+To use these control select the dot and drag it to either increase or decrease the displayed range.
+You can also use the short cut :kbd:`Ctrl-MMB` and move the mouse left/right to adjust the horizontal range
+and move the mouse up/down to adjust the vertical range.
+
+
Changing the Size and Hiding
----------------------------
Modified: trunk/blender_docs/manual/video_editing/sequencer/strips/image.rst
===================================================================
--- trunk/blender_docs/manual/video_editing/sequencer/strips/image.rst 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs/manual/video_editing/sequencer/strips/image.rst 2021-11-27 03:56:27 UTC (rev 8706)
@@ -4,6 +4,12 @@
Image/Sequence Strip
********************
+.. tip::
+
+ Image strips can display thumbnails in the Sequencer overlaid on their strips
+ by enabling the :ref:`Thumbnails <bpy.types.SequencerTimelineOverlay.show_thumbnails>` overlay.
+
+
Single Image
============
Modified: trunk/blender_docs/manual/video_editing/sequencer/strips/movie.rst
===================================================================
--- trunk/blender_docs/manual/video_editing/sequencer/strips/movie.rst 2021-11-27 03:53:48 UTC (rev 8705)
+++ trunk/blender_docs/manual/video_editing/sequencer/strips/movie.rst 2021-11-27 03:56:27 UTC (rev 8706)
@@ -13,7 +13,12 @@
Loading it, even over a high-speed LAN can take some time.
Do not assume your computer or Blender has locked up if nothing happens for awhile.
+.. tip::
+ Movie strips can display thumbnails in the Sequencer overlaid on their strips
+ by enabling the :ref:`Thumbnails <bpy.types.SequencerTimelineOverlay.show_thumbnails>` overlay.
+
+
.. _bpy.ops.sequencer.movie_strip_add:
Add Movie Strip
More information about the Bf-docboard-svn
mailing list