[Bf-docboard-svn] bf-manual: [9245] trunk/blender_docs/manual: Merge branch 'blender-3.2-release'
Alaska
noreply at blender.org
Thu May 5 09:36:19 CEST 2022
Revision: 9245
https://developer.blender.org/rBM9245
Author: Alaska
Date: 2022-05-05 09:36:19 +0200 (Thu, 05 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'
Modified Paths:
--------------
trunk/blender_docs/manual/animation/motion_paths.rst
trunk/blender_docs/manual/interface/controls/nodes/arranging.rst
trunk/blender_docs/manual/render/cycles/object_settings/cameras.rst
trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst
trunk/blender_docs/manual/render/shader_nodes/textures/image.rst
trunk/blender_docs/manual/video_editing/edit/montage/strips/scene.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs 2022-05-05 07:36:19 UTC (rev 9245)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
/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-9034
-/branches/blender-3.1-release/blender_docs:8904-9230
\ No newline at end of property
+/branches/blender-3.1-release/blender_docs:8904-9230
+/branches/blender-3.2-release/blender_docs:9236-9244
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/motion_paths.rst
===================================================================
--- trunk/blender_docs/manual/animation/motion_paths.rst 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs/manual/animation/motion_paths.rst 2022-05-05 07:36:19 UTC (rev 9245)
@@ -90,6 +90,15 @@
Allows displaying one point for every *n* frames on the path.
Mostly useful when you enable the frame number display (see below), to avoid cluttering the 3D Viewport.
+.. _bpy.types.AnimVizMotionPaths.range:
+
+Calculation Range
+ The method to choose the upper and lower bounds of Motion Paths.
+
+ :Scene Frame Range: Calculates Motion Paths for the entire Scene or Preview frame duration.
+ :Selected Keys: Calculates Motion Paths for the range of the first selected keyframe to the last keyframe.
+ :All Keys: Calculates Motion Paths from the first keyframe to the last keyframe.
+
.. _bpy.types.MotionPath.frame_start:
.. _bpy.types.MotionPath.frame_end:
Modified: trunk/blender_docs/manual/interface/controls/nodes/arranging.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/nodes/arranging.rst 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs/manual/interface/controls/nodes/arranging.rst 2022-05-05 07:36:19 UTC (rev 9245)
@@ -6,9 +6,12 @@
Snapping
========
+.. _bpy.types.ToolSettings.use_snap_node:
+
Snap
Toggle snapping mode for moving nodes around.
-Snap Node Element Selector
+
+Snap Node Element
This selector provide the following node elements for snap:
:Grid: Snap to grid background.
Modified: trunk/blender_docs/manual/render/cycles/object_settings/cameras.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/object_settings/cameras.rst 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs/manual/render/cycles/object_settings/cameras.rst 2022-05-05 07:36:19 UTC (rev 9245)
@@ -64,18 +64,23 @@
-----------------------
Match a real world camera by specifying the coordinates of a 4th degree polynomial.
-A position :math:`(x, y)` on the camera sensor in mm is mapped to a direction with
-spherical coordinates :math:`(1, \theta, \phi)` in radians as follows:
+The projection works as follows.
+Pixels in the image are mapped to positions :math:`(x, y)` on the camera sensor in mm.
+A position on the sensor is mapped to a direction with spherical coordinates
+:math:`(1, \theta, \phi)` in radians as follows:
+
.. math::
& r = \sqrt{x^2 + y^2}\\
& \theta = k_0 + k_1 r + k_2 r^2 + k_3 r^3 + k_4 r^4\\
& \phi = acos(x/r)
+Incoming light from this direction is then projected onto the corresponding pixel.
+
This can be used to model both fisheye and perspective cameras.
Mirror Ball
-----------
-Render is if taking a photo of a reflective mirror ball.
+Render as if taking a photo of a reflective mirror ball.
This can be useful in rare cases to compare with a similar photo taken to capture an environment.
Modified: trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs/manual/render/shader_nodes/input/object_info.rst 2022-05-05 07:36:19 UTC (rev 9245)
@@ -1,4 +1,4 @@
-.. _bpy.types.ShaderNodeObjectInfo:
+rB15186f4259a2e0611a64a3aed8db8858e8ca081f.. _bpy.types.ShaderNodeObjectInfo:
****************
Object Info Node
@@ -34,6 +34,8 @@
Location of the object in world space.
Color
Object color, same as *Color* in the :menuselection:`Properties --> Object Properties --> Viewport Display`.
+Alpha
+ The :term:`Alpha` component of the object's viewport display color (see the *Color* output for more details).
Object Index
Object pass index, same as *Pass Index*
in the :menuselection:`Properties --> Object Properties --> Relations`.
Modified: trunk/blender_docs/manual/render/shader_nodes/textures/image.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/textures/image.rst 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs/manual/render/shader_nodes/textures/image.rst 2022-05-05 07:36:19 UTC (rev 9245)
@@ -28,10 +28,7 @@
These include options to control the alpha channel along with addition options for the color space.
These addition options are documented with the rest of
:ref:`Common Image Settings <editors-image-image-settings-common>`.
-Color Space
- Type of data that the image contains, either Color or Non-Color Data.
- For most color textures the default of Color should be used, but in case of e.g. a bump or alpha map,
- the pixel values should be interpreted as Non-Color Data, to avoid doing any unwanted color space conversions.
+
Interpolation
Method to scale images up or down for rendering.
@@ -43,6 +40,7 @@
:Smart: :guilabel:`Cycles Only`
Only for Open Shading Language. Use cubic interpolation when scaling up and linear when scaling down,
for a better performance and sharpness.
+
Projection
Projection to use for mapping the textures.
@@ -75,7 +73,17 @@
:Extend: Will extend the image by repeating pixels on its edges.
:Clip: Clip to the original image size and set all the exterior pixels values to transparent black.
+Color Space
+ Type of data that the image contains, either Color or Non-Color Data.
+ For most color textures the default of Color should be used, but in case of e.g. a bump or alpha map,
+ the pixel values should be interpreted as Non-Color Data, to avoid doing any unwanted color space conversions.
+Alpha
+ If the source file has an Alpha (transparency) channel, you can choose how the alpha channel is encoded in the image.
+
+ :term:`Straight Alpha` or :term:`Premultiplied Alpha`
+
+
Outputs
=======
Modified: trunk/blender_docs/manual/video_editing/edit/montage/strips/scene.rst
===================================================================
--- trunk/blender_docs/manual/video_editing/edit/montage/strips/scene.rst 2022-05-04 16:24:55 UTC (rev 9244)
+++ trunk/blender_docs/manual/video_editing/edit/montage/strips/scene.rst 2022-05-05 07:36:19 UTC (rev 9245)
@@ -18,7 +18,7 @@
=======
Scene
- A :ref:`ui-data-block` to select the scene to render from.
+ A :ref:`ui-data-block` to select or create the scene to render from.
Input
Input type to use for the Scene strip.
More information about the Bf-docboard-svn
mailing list