[Bf-docboard-svn] bf-manual: [8650] trunk/blender_docs/manual: Merge branch 'blender-3.0-release'

[Alaska]

Revision: 8650
          https://developer.blender.org/rBM8650
Author:   Alaska
Date:     2021-11-20 23:36:32 +0100 (Sat, 20 Nov 2021)
Log Message:
-----------
Merge branch 'blender-3.0-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/images/modeling_geometry-nodes_instances_rotate-instances_node.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_instances_scale-instances_node.png
    trunk/blender_docs/manual/images/modeling_geometry-nodes_instances_translate-instances_node.png
    trunk/blender_docs/manual/modeling/geometry_nodes/curve/endpoint_selection.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/curve/set_handle_type.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/fields.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/instances/rotate_instances.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/instances/scale_instances.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/instances/translate_instances.rst
    trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs	2021-11-20 22:36:32 UTC (rev 8650)

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-8643
\ No newline at end of property
+/branches/blender-3.0-release/blender_docs:8543-8649
\ No newline at end of property
Modified: trunk/blender_docs/manual/images/modeling_geometry-nodes_instances_rotate-instances_node.png
===================================================================
(Binary files differ)

Modified: trunk/blender_docs/manual/images/modeling_geometry-nodes_instances_scale-instances_node.png
===================================================================
(Binary files differ)

Modified: trunk/blender_docs/manual/images/modeling_geometry-nodes_instances_translate-instances_node.png
===================================================================
(Binary files differ)

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/curve/endpoint_selection.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/curve/endpoint_selection.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/curve/endpoint_selection.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -44,7 +44,7 @@
 =======
 
 Selection
-   Selection of start and end of each spline of the curve.
+   Selection of the start and end of each spline of the curve.
 
 
 Examples

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/curve/set_handle_type.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/curve/set_handle_type.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/curve/set_handle_type.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -12,8 +12,8 @@
 
 Sets the handle type for the points on the Bézier curve that are in the selection.
 
-The handle type of each control point can be retrieved with
-the :doc:`/modeling/geometry_nodes/curve/set_handle_type`.
+A selection for a certain handle type can be retrieved with
+the :doc:`/modeling/geometry_nodes/curve/handle_type_selection`.
 
 
 Inputs

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/fields.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/fields.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/fields.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -105,10 +105,13 @@
 :doc:`/modeling/geometry_nodes/point/distribute_points_on_faces`, 
 in the form of :ref:`anonymous-attributes`.
 
-
 Field Context
 =============
 
+All field nodes work in the context of the data flow node they are connected to.
+The context usually consists of a geometry component type and an attribute domain,
+so it determines what data is retrieved from input nodes. 
+
 One common misunderstanding is that the same field network used in multipled places will
 output the same data. This is not necessarily true, because the field network will be evaluated
 for every data flow node, potentially retrieving data from a different or changed geometry.

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/instances/rotate_instances.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/instances/rotate_instances.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/instances/rotate_instances.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -10,9 +10,11 @@
 
    The Rotate Instances node.
 
-The *Rotate Instances* node rotates instances in local or global space.
+The *Rotate Instances* node rotates a geometry's instances in local or global space.
 
+The :doc:`/modeling/geometry_nodes/instances` page contains more information about geometry instances.
 
+
 Inputs
 ======
 
@@ -20,16 +22,19 @@
    Standard geometry input.
 
 Selection
-   The instances that will be rotated.
+   Boolean field used to determine if an instance will be rotated.
 
 Rotation
-   The Euler rotation to rotate the instances by.
+   The :term:`Euler` rotation to rotate the instances by.
 
 Pivot Point
-   The position where the instances are rotated.
+   The position around which each instance is rotated. If the *Local Space* input is true,
+   the location is relative to the initial transform of the instance.
 
 Local Space
-   If enabled, the instances are rotated in local space otherwise they are rotated in global space.
+   If enabled, the instances are rotated in local space. In other words, they are rotated around the
+   axes described by each instance's initial transform. When the input is disabled, the pivot point
+   and rotation are specified in the local space of the modifier object.
 
 
 Properties

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/instances/scale_instances.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/instances/scale_instances.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/instances/scale_instances.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -10,9 +10,11 @@
 
    The Scale Instances node.
 
-The *Scale Instances* node scales instances in local or global space.
+The *Scale Instances* node scales a geometry's instances in local or global space.
 
+The :doc:`/modeling/geometry_nodes/instances` page contains more information about geometry instances.
 
+
 Inputs
 ======
 
@@ -20,16 +22,20 @@
    Standard geometry input.
 
 Selection
-   The instances that will be scaled.
+   Boolean field used to determine if an instance will be scaled.
 
 Scale
-   Scales the instances in given dimensions.
+   The scale factor to apply to the instance's transform on each axis.
 
 Center
-   The position where instances are scaled.
+   The position from which the instance origins are scaled. Each instance will move away from this
+   location. When the *Local Space* input is enabled, this location is relative to the initial
+   transform of each instance.
 
 Local Space
-   If enabled, the instances are scaled in local space otherwise they are scaled in global space.
+   If enabled, the instances are scaled in local space. In other words, they are scaled in the
+   directions the described by each instance's initial transform. When the input is disabled, the
+   *Center* and *Scale* inputs are specified in the local space of the modifier object.
 
 
 Properties

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/instances/translate_instances.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/instances/translate_instances.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/instances/translate_instances.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -10,8 +10,9 @@
 
    The Translate Instances node.
 
-The *Translate Instances* node translates instances in local or global space.
+The *Translate Instances* node moves a geometry's top-level instances in local or global space.
 
+The :doc:`/modeling/geometry_nodes/instances` page contains more information about geometry instances.
 
 Inputs
 ======
@@ -20,13 +21,14 @@
    Standard geometry input.
 
 Selection
-   The instances that will be translated.
+   Boolean field used to determine if an instance will be translated.
 
 Translation
    The vector to translate the instances by.
 
 Local Space
-   If enabled, the instances are translated in local space otherwise they are translated in global space.
+   If enabled, the instances are translated relative to their initial rotation.
+   Otherwise they are translated in the local space of the modifier object.
 
 
 Properties

Modified: trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst	2021-11-20 22:35:00 UTC (rev 8649)
+++ trunk/blender_docs/manual/render/cycles/render_settings/sampling.rst	2021-11-20 22:36:32 UTC (rev 8650)
@@ -194,6 +194,11 @@
    Adaptive
       Uses a formula to adapt the scrambling distance strength based on the sample count.
 
+      .. note::
+      
+         When *Adaptive Scrambling Distance* is enabled, *Scrambling Distance* behaves like a modifier for
+         the *Adaptive Scrambling Distance* value.
+
    .. _bpy.types.CyclesRenderSettings.preview_scrambling_distance:
 
    Viewport