[Bf-docboard-svn] bf-manual: [7636] trunk/blender_docs/manual: Merge branch 'blender-v2.92-release'
Aaron Carlisle
noreply at blender.org
Fri Jan 22 04:45:13 CET 2021
Revision: 7636
https://developer.blender.org/rBM7636
Author: Blendify
Date: 2021-01-22 04:45:13 +0100 (Fri, 22 Jan 2021)
Log Message:
-----------
Merge branch 'blender-v2.92-release'
Modified Paths:
--------------
trunk/blender_docs/manual/animation/drivers/workflow_examples.rst
trunk/blender_docs/manual/editors/geometry_node.rst
trunk/blender_docs/manual/editors/outliner/interface.rst
trunk/blender_docs/manual/editors/preferences/animation.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_compare.rst
trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_randomize.rst
trunk/blender_docs/manual/modeling/geometry_nodes/input/object_info.rst
trunk/blender_docs/manual/modeling/geometry_nodes/point/point_rotate.rst
trunk/blender_docs/manual/modeling/geometry_nodes/point/point_scale.rst
trunk/blender_docs/manual/modeling/geometry_nodes/point/point_translate.rst
trunk/blender_docs/manual/modeling/geometry_nodes/utilities/float_compare.rst
trunk/blender_docs/manual/modeling/modifiers/generate/mask.rst
trunk/blender_docs/manual/modeling/modifiers/introduction.rst
trunk/blender_docs/manual/modeling/modifiers/modify/weight_edit.rst
trunk/blender_docs/manual/modeling/modifiers/modify/weight_proximity.rst
trunk/blender_docs/manual/movie_clip/tracking/clip/sidebar/annotation.rst
trunk/blender_docs/manual/sculpt_paint/sculpting/toolbar.rst
trunk/blender_docs/manual/sculpt_paint/sculpting/tools/grab.rst
trunk/blender_docs/manual/sculpt_paint/sculpting/tools/line_project.rst
trunk/blender_docs/manual/video_editing/sequencer/editing.rst
trunk/blender_docs/manual/video_editing/sequencer/sidebar/strip.rst
trunk/blender_docs/manual/video_editing/sequencer/strips/movie_image.rst
trunk/blender_docs/manual/video_editing/sequencer/strips/sound.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs 2021-01-22 03:45:13 UTC (rev 7636)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7631
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7635
\ No newline at end of property
Modified: trunk/blender_docs/manual/animation/drivers/workflow_examples.rst
===================================================================
--- trunk/blender_docs/manual/animation/drivers/workflow_examples.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/animation/drivers/workflow_examples.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -266,14 +266,14 @@
with a function of type :math:`y = a + bx`,
where :math:`a` is an offset in :math:`y` and :math:`b` is the slope.
- #. In the *Modifiers* tab, add a *Generator* of type *Extended Polynomial* for both drivers.
- #. Play with the values of :math:`a` and :math:`b` so that the curves go from [0.0 , 1.0]
- in the Y axis and from [0.0 , 2.5] in the X axis.
- The curves should overlap in the mid area of the X axis and they should have the same slope (:math:`b`).
+ #. In the *Modifiers* tab, add a *Generator* of type *Extended Polynomial* for both drivers.
+ #. Play with the values of :math:`a` and :math:`b` so that the curves go from [0.0 , 1.0]
+ in the Y axis and from [0.0 , 2.5] in the X axis.
+ The curves should overlap in the mid area of the X axis and they should have the same slope (:math:`b`).
- Possible values are *Key 1*: :math:`y = 0.0 + 0.6x` and *Key 2*: :math:`y = -0.5 + 0.6x`.
+ Possible values are *Key 1*: :math:`y = 0.0 + 0.6x` and *Key 2*: :math:`y = -0.5 + 0.6x`.
- .. figure:: /images/animation_drivers_workflow-examples_chained-shape-keys-driver-setup.png
+ .. figure:: /images/animation_drivers_workflow-examples_chained-shape-keys-driver-setup.png
- Note that the functions go outside the range [0.0 , 1.0] for the shape keys' *Value*,
- but that has no effect because *Value* is clamped in a *Range* in the *Shape Keys* panel.
+ Note that the functions go outside the range [0.0 , 1.0] for the shape keys' *Value*,
+ but that has no effect because *Value* is clamped in a *Range* in the *Shape Keys* panel.
Modified: trunk/blender_docs/manual/editors/geometry_node.rst
===================================================================
--- trunk/blender_docs/manual/editors/geometry_node.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/editors/geometry_node.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -63,8 +63,8 @@
.. tip::
- The inputs of the node group can be edited as properties of the
- :doc:`Geometry Node Modifier </modeling/modifiers/generate/geometry_nodes>`.
+ The inputs of the node group can be edited as properties of
+ the :doc:`Geometry Node Modifier </modeling/modifiers/generate/geometry_nodes>`.
Item
Modified: trunk/blender_docs/manual/editors/outliner/interface.rst
===================================================================
--- trunk/blender_docs/manual/editors/outliner/interface.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/editors/outliner/interface.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -139,12 +139,13 @@
Show Mode Column
Show the object mode toggling column in View Layer and Scenes display modes.
+
.. rubric:: Search
.. _bpy.types.SpaceOutliner.use_filter_complete:
Exact Match
- The results of :ref:`bpy.types.SpaceOutliner.filter_text` must match the full text and not a substring.
+ The results of :ref:`bpy.types.SpaceOutliner.filter_text` must match the full text and just a part of it.
.. _bpy.types.SpaceOutliner.use_filter_case_sensitive:
@@ -151,6 +152,7 @@
Case Sensitive
The results of :ref:`bpy.types.SpaceOutliner.filter_text` are case sensitive.
+
.. rubric:: Filter
.. _bpy.types.SpaceOutliner.use_filter_collection:
@@ -198,7 +200,7 @@
Object Children
List the object children. If the *Collections* option is enabled,
you will see the object children even if the children are not in the collection.
- However the Outliner shows them as a dashed line.
+ Yet the Outliner shows them as a dashed line.
.. _bpy.types.SpaceOutliner.use_filter_object_mesh:
.. _bpy.types.SpaceOutliner.use_filter_object_light:
Modified: trunk/blender_docs/manual/editors/preferences/animation.rst
===================================================================
--- trunk/blender_docs/manual/editors/preferences/animation.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/editors/preferences/animation.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -71,7 +71,7 @@
Unselected Opacity
Controls the opacity of unselected :doc:`F-Curves </editors/graph_editor/fcurves/index>` against
- the background of the *Graph Editor*.
+ the background of the Graph Editor.
Default Smoothing Mode
Controls the behavior of :ref:`automatic curve handles <editors-graph-fcurves-settings-handles>`
for newly created F-curves.
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_compare.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_compare.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_compare.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -10,7 +10,7 @@
The Attribute Compare node.
-This node reads two input attributes as floats and allows for basic element-wise comparison operations.
+This node reads two input attributes as floats and allows for basic elementwise comparison operations.
Like the :doc:`Attribute Math </modeling/geometry_nodes/attribute/attribute_math>` node,
it is also possible to switch to using single values for inputs. This node can be combined with
the :doc:`Point Separate </modeling/geometry_nodes/point/point_separate>` node for more flexibility
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_randomize.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_randomize.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_randomize.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -11,9 +11,10 @@
Attribute Randomize Node.
-The *Attribute Randomize* node replaces the values in an
-attribute with random values within the given range.
+The *Attribute Randomize* node replaces the values in an attribute
+with random values within the given range.
+
Inputs
======
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/input/object_info.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/input/object_info.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/input/object_info.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -26,7 +26,7 @@
==========
Transform Space
- The transformation of the vector and geometry outputs
+ The transformation of the vector and geometry outputs.
Original
Output the geometry relative to the input object transform, and the location,
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/point/point_rotate.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/point/point_rotate.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/point/point_rotate.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -11,7 +11,7 @@
The Point Rotate node.
The *Point Rotate* node rotates every point of the geometry.
-It does so by modifying the *Rotation* attribute.
+It does so by modifying the *rotation* attribute.
Inputs
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/point/point_scale.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/point/point_scale.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/point/point_scale.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -12,8 +12,8 @@
The *Point Scale* node changes the *scale* attribute of every point in the geometry
by the specified amount, either from the attribute input or a vector input.
-This node is provided for convenience, as it's equivalent to using the
-:doc:`Attribute Vector Math Node </modeling/geometry_nodes/attribute/attribute_vector_math>`
+This node is provided for convenience, as it's equivalent to using
+the :doc:`Attribute Vector Math Node </modeling/geometry_nodes/attribute/attribute_vector_math>`
with the *Multiply* operation and the *scale* attribute.
The *scale* attribute is used by the :doc:`Point Instance Node </modeling/geometry_nodes/point/point_instance>` to
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/point/point_translate.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/point/point_translate.rst 2021-01-22 03:43:17 UTC (rev 7635)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/point/point_translate.rst 2021-01-22 03:45:13 UTC (rev 7636)
@@ -12,8 +12,8 @@
The *Point Translate Node* moves every point of the geometry by the specified amount,
either from the attribute input or a vector input.
-This node is provided for convenience, as it's equivalent to using the
-:doc:`Attribute Vector Math Node </modeling/geometry_nodes/attribute/attribute_vector_math>`
+This node is provided for convenience, as it's equivalent to using
+the :doc:`Attribute Vector Math Node </modeling/geometry_nodes/attribute/attribute_vector_math>`
with the *Addition* operation and the *position* attribute.
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/utilities/float_compare.rst
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list