[Bf-docboard-svn] bf-manual: [8634] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'
Aaron Carlisle
noreply at blender.org
Wed Nov 17 00:51:31 CET 2021
Revision: 8634
https://developer.blender.org/rBM8634
Author: Blendify
Date: 2021-11-17 00:51:30 +0100 (Wed, 17 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'
Modified Paths:
--------------
trunk/blender_docs/make.bat
trunk/blender_docs/manual/animation/motion_paths.rst
trunk/blender_docs/manual/editors/3dview/display/gizmo.rst
trunk/blender_docs/manual/editors/3dview/display/overlays.rst
trunk/blender_docs/manual/editors/3dview/selecting.rst
trunk/blender_docs/manual/editors/outliner/editing.rst
trunk/blender_docs/manual/editors/preferences/file_paths.rst
trunk/blender_docs/manual/editors/video_sequencer/preview/controls/pivot_point.rst
trunk/blender_docs/manual/editors/video_sequencer/preview/display/gizmos.rst
trunk/blender_docs/manual/editors/video_sequencer/preview/display/overlays.rst
trunk/blender_docs/manual/editors/video_sequencer/preview/introduction.rst
trunk/blender_docs/manual/files/linked_libraries/assets.rst
trunk/blender_docs/manual/grease_pencil/visual_effects/glow.rst
trunk/blender_docs/manual/images/modeling_geometry-nodes_geometry_transform_node.png
trunk/blender_docs/manual/interface/index.rst
trunk/blender_docs/manual/interface/keymap/blender_default.rst
trunk/blender_docs/manual/modeling/curves/selecting.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_statistic.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/capture_attribute.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst
trunk/blender_docs/manual/modeling/geometry_nodes/geometry/transform.rst
trunk/blender_docs/manual/modeling/geometry_nodes/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/input/position.rst
trunk/blender_docs/manual/modeling/geometry_nodes/inspection.rst
trunk/blender_docs/manual/modeling/geometry_nodes/instances/instance_on_points.rst
trunk/blender_docs/manual/modeling/geometry_nodes/mesh_primitives/icosphere.rst
trunk/blender_docs/manual/modeling/geometry_nodes/utilities/align_euler_to_vector.rst
trunk/blender_docs/manual/modeling/geometry_nodes/utilities/rotate_euler.rst
trunk/blender_docs/manual/modeling/meshes/selecting/introduction.rst
trunk/blender_docs/manual/modeling/surfaces/selecting.rst
trunk/blender_docs/manual/render/cycles/gpu_rendering.rst
trunk/blender_docs/manual/scene_layout/object/editing/asset.rst
Added Paths:
-----------
trunk/blender_docs/manual/images/modeling_geometry-nodes_fields_constant.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_fields_flow-1.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_fields_flow-2.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_fields_flow-3.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_fields_title.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_fields_varying.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_instances-nested-tree.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_instances-nested.png
trunk/blender_docs/manual/images/modeling_geometry-nodes_instances.png
trunk/blender_docs/manual/interface/controls/templates/list_view.rst
trunk/blender_docs/manual/modeling/geometry_nodes/fields.rst
trunk/blender_docs/manual/modeling/geometry_nodes/instances.rst
Removed Paths:
-------------
trunk/blender_docs/manual/interface/controls/templates/list_presets.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs 2021-11-16 23:51:30 UTC (rev 8634)
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-8619
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8633
\ No newline at end of property
Modified: trunk/blender_docs/make.bat
===================================================================
--- trunk/blender_docs/make.bat 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs/make.bat 2021-11-16 23:51:30 UTC (rev 8634)
@@ -5,7 +5,7 @@
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
-set SOURCEDIR=./manual
+set SOURCEDIR=.\manual
set BUILDDIR=build
if "%BF_LANG%" == "" set BF_LANG=en
set SPHINXOPTS=-j auto -D language=%BF_LANG%
@@ -21,13 +21,14 @@
%SPHINXBUILD% 2> nul
if errorlevel 9009 (
echo.
- echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
- echo.installed, then set the SPHINXBUILD environment variable to point
- echo.to the full path of the 'sphinx-build' executable. Alternatively you
- echo.may add the Sphinx directory to PATH.
+ echo The 'sphinx-build' command was not found. Make sure you have Sphinx
+ echo installed, then set the SPHINXBUILD environment variable to point
+ echo to the full path of the 'sphinx-build' executable. Alternatively you
+ echo may add the Sphinx directory to PATH.
echo.
- echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
+ echo If you don't have Sphinx installed, grab it from
+ echo http://sphinx-doc.org/
+ rem Exit with errorlevel 1
exit /b 1
)
@@ -40,88 +41,98 @@
if "%1" == "help" (
echo.
- echo.Sphinx
- echo.======
- %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+ echo Sphinx
+ echo ======
+ %SPHINXBUILD% -M help "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS% %O%
echo.
- echo.Custom Targets
- echo.==============
- echo.Convenience targets provided for building docs
+ echo Custom Targets
+ echo ==============
+ echo Convenience targets provided for building docs
echo.
- echo.- livehtml (default) to auto build on file changes and host on localhost
- echo.- readme to make a 'readme.html' file
- echo.- clean to delete all old build files
+ echo - livehtml [default] to auto build on file changes and host on localhost
+ echo - readme to make a 'readme.html' file
+ echo - clean to delete all old build files
echo.
- echo.Translations
- echo.------------
+ echo Translations
+ echo ------------
echo.
- echo.- update_po to update PO message catalogs
- echo.- report_po_progress to check the progress/fuzzy strings
+ echo - update_po to update PO message catalogs
+ echo - report_po_progress to check the progress/fuzzy strings [optionally specify locale]
echo.
- echo.Checking
- echo.--------
+ echo Checking
+ echo --------
echo.
- echo.- check_structure to check the structure of all .rst files
- echo.- check_syntax to check the syntax of all .rst files
- echo.- check_spelling to check spelling for text in RST files
+ echo - check_structure to check the structure of all .rst files
+ echo - check_syntax to check the syntax of all .rst files
+ echo - check_spelling to check spelling for text in RST files
goto EOF
)
if "%1" == "livehtml" (
:livehtml
- sphinx-autobuild --open-browser --delay 0 %SOURCEDIR% %BUILDDIR%/html %SPHINXOPTS% %O%
+ sphinx-autobuild --open-browser --delay 0 "%SOURCEDIR%" "%BUILDDIR%\html" %SPHINXOPTS% %O%
if errorlevel 1 exit /b 1
goto EOF
)
if "%1" == "latexpdf" (
- %SPHINXBUILD% -b latex %SPHINXOPTS% %O% %SOURCEDIR% %BUILDDIR%/latex
- cd %BUILDDIR%/latex
+ %SPHINXBUILD% -b latex %SPHINXOPTS% %O% "%SOURCEDIR%" "%BUILDDIR%\latex"
+ cd "%BUILDDIR%\latex"
make all-pdf
cd %~dp0
- echo.To view, run:
- echo. start %BUILDDIR%/html/blender_manual.pdf
+ echo To view, run:
+ echo start "%BUILDDIR%\html\blender_manual.pdf"
goto EOF
)
if "%1" == "readme" (
- rst2html5.py readme.rst > %BUILDDIR%/readme.html
- echo.Build finished. The HTML page is in %BUILDDIR%/readme.html.
- echo.To view, run:
- echo. start %BUILDDIR%/readme.html
+ rst2html5.py readme.rst > "%BUILDDIR%\readme.html"
+ echo Build finished. The HTML page is in "%BUILDDIR%\readme.html".
+ echo To view, run:
+ echo start "%BUILDDIR%\readme.html"
goto EOF
)
if "%1" == "check_syntax" (
- python tools_rst/rst_check_syntax.py --kbd --long
+ python tools_rst\rst_check_syntax.py --kbd --long
goto EOF
)
if "%1" == "update_po" (
- python tools_maintenance/update_po.py
+ python tools_maintenance\update_po.py
goto EOF
)
if "%1" == "report_po_progress" (
- IF NOT EXIST %cd%/locale GOTO MISSING_LOCALE
- python tools_report/report_translation_progress.py locale/%2 --quiet
+ IF NOT EXIST %cd%\locale GOTO MISSING_LOCALE
+ python tools_report\report_translation_progress.py locale\%2 --quiet
goto EOF
)
if "%1" == "check_spelling" (
- echo. here
- python tools_rst/rst_check_spelling.py
+ echo here
+ python tools_rst\rst_check_spelling.py
goto EOF
)
if "%1" == "check_structure" (
- python tools_rst/rst_check_images.py
+ python tools_rst\rst_check_images.py
goto EOF
) else (
- %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+ %SPHINXBUILD% -M %1 "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS% %O%
goto EOF
)
+:MISSING_LOCALE
+echo.
+echo The locale directory is missing.
+echo.
+echo To correct this, checkout one or more translation repositories.
+echo Details can be found at:
+echo https://docs.blender.org/manual/en/latest/about/contribute/translations/contribute.html
+rem Exit with errorlevel 1
+exit /b 1
+
:EOF
Modified: trunk/blender_docs/manual/animation/motion_paths.rst
===================================================================
--- trunk/blender_docs/manual/animation/motion_paths.rst 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs/manual/animation/motion_paths.rst 2021-11-16 23:51:30 UTC (rev 8634)
@@ -74,15 +74,15 @@
.. _bpy.types.AnimVizMotionPaths.frame_end:
Frame Range Start, End
- Starting and Ending frame of range of paths to display/calculate
- (not for *Around Current Frame* Onion-skinning method).
+ Starting and Ending frame of range of paths to display/calculate
+ (not for *Around Current Frame* onion skinning method).
.. _bpy.types.AnimVizMotionPaths.frame_before:
.. _bpy.types.AnimVizMotionPaths.frame_after:
Frame Range Before, After
- Number of frames to show before and after the current frame
- (only for *Around Current Frame* Onion-skinning method).
+ Number of frames to show before and after the current frame
+ (only for *Around Current Frame* onion skinning method).
.. _bpy.types.AnimVizMotionPaths.frame_step:
@@ -110,10 +110,10 @@
These are the start/end frames of the range in which motion paths are shown.
The start frame is *inclusive*, so if you set *Start* to 1,
you will really see the frame 1 as starting point of the paths...
-
+
Bake Location
Which point on the bones is used when calculating paths.
- Only available for bones while in Pose mode.
+ Only available for bones while in Pose Mode.
:Heads: Calculates the path position of the bone's heads.
:Tails: Calculates the path position of the bone's heads.
@@ -134,7 +134,7 @@
.. _bpy.ops.object.paths_update_visible:
Update All Paths
- Recalculates the motion paths for all visible objects and poses
+ Recalculates the motion paths for all visible objects and poses.
Display
Modified: trunk/blender_docs/manual/editors/3dview/display/gizmo.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/display/gizmo.rst 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs/manual/editors/3dview/display/gizmo.rst 2021-11-16 23:51:30 UTC (rev 8634)
@@ -11,7 +11,7 @@
:Header: |gizmo-icon| :menuselection:`Viewport Gizmos --> Object Gizmos`
The way how gizmos are displayed in the 3D Viewport can be changed in the Viewport Gizmos pop-over.
-There is a switch to turn off all gizmos for the 3D Viewport.
+There is a toggle to hide all gizmos for the 3D Viewport.
Viewport Gizmos
Modified: trunk/blender_docs/manual/editors/3dview/display/overlays.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/display/overlays.rst 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs/manual/editors/3dview/display/overlays.rst 2021-11-16 23:51:30 UTC (rev 8634)
@@ -5,7 +5,7 @@
*****************
Using the Viewport Overlays pop-over settings for the overlays can be configured.
-There is a switch to turn off all overlays for the 3D Viewport.
+There is a toggle to hide all overlays for the 3D Viewport.
The options that are visible in the pop-over depend on the mode that the 3D Viewport is in.
@@ -242,7 +242,7 @@
.. _bpy.types.View3DOverlay.use_normals_constant_screen_size:
Constant Screen Size Normals
- Keep size of normals constant in relation to the zoom level.
+ Keep the size of normals constant in relation to the zoom level.
Developer
Modified: trunk/blender_docs/manual/editors/3dview/selecting.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/selecting.rst 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs/manual/editors/3dview/selecting.rst 2021-11-16 23:51:30 UTC (rev 8634)
@@ -52,4 +52,4 @@
Particle Edit Mode
==================
-:ref:`Particle Edit Mode <particle-edit-selecting>`.
+:ref:`Particle Edit Mode <particle-edit-selecting>`
Modified: trunk/blender_docs/manual/editors/outliner/editing.rst
===================================================================
--- trunk/blender_docs/manual/editors/outliner/editing.rst 2021-11-16 23:50:00 UTC (rev 8633)
+++ trunk/blender_docs/manual/editors/outliner/editing.rst 2021-11-16 23:51:30 UTC (rev 8634)
@@ -159,7 +159,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list