[Bf-docboard-svn] bf-manual: [8942] trunk/blender_docs/manual: Merge branch 'blender-3.1-release'
Alaska
noreply at blender.org
Thu Feb 10 02:12:18 CET 2022
Revision: 8942
https://developer.blender.org/rBM8942
Author: Alaska
Date: 2022-02-10 02:12:18 +0100 (Thu, 10 Feb 2022)
Log Message:
-----------
Merge branch 'blender-3.1-release'
Modified Paths:
--------------
trunk/blender_docs/manual/editors/preferences/file_paths.rst
trunk/blender_docs/manual/interface/window_system/topbar.rst
trunk/blender_docs/manual/render/output/animation_player.rst
trunk/blender_docs/manual/render/output/introduction.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-02-10 00:36:41 UTC (rev 8941)
+++ trunk/blender_docs 2022-02-10 01:12:18 UTC (rev 8942)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +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:8543-8925
-/branches/blender-3.1-release/blender_docs:8904-8939
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-8941
\ No newline at end of property
Modified: trunk/blender_docs/manual/editors/preferences/file_paths.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/file_paths.rst 2022-02-10 00:36:41 UTC (rev 8941)
+++ trunk/blender_docs/manual/editors/preferences/file_paths.rst 2022-02-10 01:12:18 UTC (rev 8942)
@@ -82,7 +82,7 @@
:ref:`View Animation <topbar-render-view_animation>`.
By default this is set to *Internal* which uses Blender's built-in
- :ref:`animation player <render-output-animation_player>`.
+ :ref:`animation player <bpy.ops.render.play_rendered_anim>`.
This has the advantage that all image formats supported by Blender can be played back
and no 3rd party application needs to be installed.
Modified: trunk/blender_docs/manual/interface/window_system/topbar.rst
===================================================================
--- trunk/blender_docs/manual/interface/window_system/topbar.rst 2022-02-10 00:36:41 UTC (rev 8941)
+++ trunk/blender_docs/manual/interface/window_system/topbar.rst 2022-02-10 01:12:18 UTC (rev 8942)
@@ -216,7 +216,7 @@
.. seealso::
- - :ref:`Animation player <render-output-animation_player>` for details.
+ - :ref:`Animation player <bpy.ops.render.play_rendered_anim>` for details.
- :ref:`Animation player <prefs-file_paths-animation_player>` preferences to select
different animation players.
Lock Interface
Modified: trunk/blender_docs/manual/render/output/animation_player.rst
===================================================================
--- trunk/blender_docs/manual/render/output/animation_player.rst 2022-02-10 00:36:41 UTC (rev 8941)
+++ trunk/blender_docs/manual/render/output/animation_player.rst 2022-02-10 01:12:18 UTC (rev 8942)
@@ -1,5 +1,4 @@
-.. _bpy.ops.render.play-rendered-anim:
-.. _render-output-animation_player:
+.. _bpy.ops.render.play_rendered_anim:
.. |numsp| unicode:: U+2007
@@ -7,19 +6,15 @@
Animation Player
****************
-The animation player is a utility typically used for previewing rendered animations,
-supporting all image and video formats also supported by Blender.
-This is a convenient way to play back image sequences at the correct frame rate.
-
-
-Usage
-=====
-
.. reference::
:Menu: :menuselection:`Topbar --> Render --> View Animation`
:Shortcut: :kbd:`Ctrl-F11`
+The animation player is a utility typically used for previewing rendered animations,
+supporting all image and video formats also supported by Blender.
+This is a convenient way to play back image sequences at the correct frame rate.
+
Launching the animation player opens a new window,
playing back images or a video located at the render output of the current scene.
You can also drop images or movie files in a running animation player.
@@ -32,7 +27,7 @@
Player Options
---------------
+==============
Ping Pong
When enabled, playback loops forwards than backwards.
@@ -42,8 +37,8 @@
*Viewing the animation from a different perspective can help you see the animation with "fresh eyes".*
-Shortcuts
----------
+Hotkeys
+=======
The following table shows the available hotkeys for the animation player.
@@ -160,7 +155,7 @@
Frame Cache
------------
+===========
Image files are cached during playback for faster access.
Modified: trunk/blender_docs/manual/render/output/introduction.rst
===================================================================
--- trunk/blender_docs/manual/render/output/introduction.rst 2022-02-10 00:36:41 UTC (rev 8941)
+++ trunk/blender_docs/manual/render/output/introduction.rst 2022-02-10 01:12:18 UTC (rev 8942)
@@ -22,7 +22,7 @@
.. tip::
- Rendered image sequences can be played back in the :ref:`Animation Player <render-output-animation_player>`.
+ Rendered image sequences can be played back in the :ref:`Animation Player <bpy.ops.render.play_rendered_anim>`.
.. seealso::
More information about the Bf-docboard-svn
mailing list