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

Aaron Carlisle noreply at blender.org
Mon Feb 8 05:01:28 CET 2021 

Revision: 7728
          https://developer.blender.org/rBM7728
Author:   Blendify
Date:     2021-02-08 05:01:28 +0100 (Mon, 08 Feb 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/addons/interface/collection_manager.rst
    trunk/blender_docs/manual/addons/node/node_wrangler.rst
    trunk/blender_docs/manual/addons/system/blender_id.rst
    trunk/blender_docs/manual/animation/drivers/drivers_panel.rst
    trunk/blender_docs/manual/animation/drivers/workflow_examples.rst
    trunk/blender_docs/manual/compositing/types/matte/channel_key.rst
    trunk/blender_docs/manual/editors/3dview/toolbar/add_cone.rst
    trunk/blender_docs/manual/editors/3dview/toolbar/add_cube.rst
    trunk/blender_docs/manual/editors/3dview/toolbar/add_cylinder.rst
    trunk/blender_docs/manual/editors/3dview/toolbar/add_icosphere.rst
    trunk/blender_docs/manual/editors/3dview/toolbar/add_uvsphere.rst
    trunk/blender_docs/manual/editors/3dview/toolbar/measure.rst
    trunk/blender_docs/manual/editors/file_browser.rst
    trunk/blender_docs/manual/editors/image/editing.rst
    trunk/blender_docs/manual/editors/outliner/interface.rst
    trunk/blender_docs/manual/editors/outliner/selecting.rst
    trunk/blender_docs/manual/editors/properties_editor.rst
    trunk/blender_docs/manual/glossary/index.rst
    trunk/blender_docs/manual/grease_pencil/materials/grease_pencil_shader.rst
    trunk/blender_docs/manual/grease_pencil/modes/draw/introduction.rst
    trunk/blender_docs/manual/grease_pencil/modes/edit/grease_pencil_menu.rst
    trunk/blender_docs/manual/grease_pencil/modifiers/color/texture_mapping.rst
    trunk/blender_docs/manual/index.rst
    trunk/blender_docs/manual/interface/controls/nodes/editing.rst
    trunk/blender_docs/manual/interface/controls/nodes/groups.rst
    trunk/blender_docs/manual/interface/controls/templates/color_picker.rst
    trunk/blender_docs/manual/interface/keymap/blender_default.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attribute/attribute_compare.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/attributes_reference.rst
    trunk/blender_docs/manual/modeling/meshes/tools/toolbar.rst
    trunk/blender_docs/manual/modeling/modifiers/generate/multiresolution.rst
    trunk/blender_docs/manual/modeling/modifiers/introduction.rst
    trunk/blender_docs/manual/movie_clip/tracking/clip/sidebar/annotation.rst
    trunk/blender_docs/manual/physics/collision.rst
    trunk/blender_docs/manual/render/cycles/render_settings/performance.rst
    trunk/blender_docs/manual/render/output/animation.rst
    trunk/blender_docs/manual/render/shader_nodes/converter/vector_math.rst
    trunk/blender_docs/manual/scene_layout/object/tools/toolbar.rst
    trunk/blender_docs/manual/sculpt_paint/sculpting/tools/multires_displacement_eraser.rst
    trunk/blender_docs/manual/video_editing/sequencer/strips/movie_image.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs	2021-02-08 04:01:28 UTC (rev 7728)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7720
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7727
\ No newline at end of property
Modified: trunk/blender_docs/manual/addons/interface/collection_manager.rst
===================================================================
--- trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/addons/interface/collection_manager.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -93,7 +93,7 @@
 
    Disclosure (small triangle icon)
       - :kbd:`LMB` -- Expand/collapse subcollections.
-      - :kbd:`Shift-LMB` --  Isolate the tree. Collapses everything but the current item,
+      - :kbd:`Shift-LMB` -- Isolate the tree. Collapses everything but the current item,
         and it’s parents/descendants. Click again to restore the previous state.
       - :kbd:`Ctrl-LMB` -- Expand/collapse subcollections and their descendants.
 

Modified: trunk/blender_docs/manual/addons/node/node_wrangler.rst
===================================================================
--- trunk/blender_docs/manual/addons/node/node_wrangler.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/addons/node/node_wrangler.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -150,7 +150,7 @@
 Select Mix nodes or Math nodes and change their blend mode or math operation at the same time.
 Use keys specified above. They will change the blend mode or operation accordingly to:
 Mix, Add, Subtract, Divide, Less than, Greater than.
-Use :kbd:`Alt-Up` or  :kbd:`Alt-Down` to go through all available blend modes or math operations.
+Use :kbd:`Alt-Up` or :kbd:`Alt-Down` to go through all available blend modes or math operations.
 
 
 Change Mix Factor

Modified: trunk/blender_docs/manual/addons/system/blender_id.rst
===================================================================
--- trunk/blender_docs/manual/addons/system/blender_id.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/addons/system/blender_id.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -29,7 +29,7 @@
 
 - Windows:
 
-  .. parsed-literal:: %APPDATA%\Blender Foundation\Blender\|BLENDER_VERSION|\config\blender_id
+  .. parsed-literal:: %APPDATA%\\Blender Foundation\\Blender\\\ |BLENDER_VERSION|\\config\\blender_id
 
 
 Description

Modified: trunk/blender_docs/manual/animation/drivers/drivers_panel.rst
===================================================================
--- trunk/blender_docs/manual/animation/drivers/drivers_panel.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/animation/drivers/drivers_panel.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -57,7 +57,7 @@
 Variables
 ---------
 
-See  `Driver Variables`_.
+See `Driver Variables`_.
 
 
 Update Dependencies

Modified: trunk/blender_docs/manual/animation/drivers/workflow_examples.rst
===================================================================
--- trunk/blender_docs/manual/animation/drivers/workflow_examples.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/animation/drivers/workflow_examples.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -4,7 +4,6 @@
 *******************
 
 Simple Drivers can be configured from the pop-over that appears when adding a new Driver.
-
 When adding multiple Drivers or for more advanced configurations,
 it is useful to have open the :doc:`Drivers Editor </editors/drivers_editor>`.
 
@@ -14,7 +13,6 @@
 
 Control a property with an object's transform.
 In this example, the Y rotation of Object 2 will be driven by the X position of Object 1.
-
 Starting from a simple setup with two objects:
 
 #. Add a Driver to the *Rotation Y* property of the second object via the context menu or with :kbd:`Ctrl-D`.
@@ -35,10 +33,8 @@
 
 Orbit an object's position around a point with a custom *Scripted Expression*.
 The object's position will change when scrubbing the timeline.
-
 Using trigonometry, circular motion can be defined in 2D using the sine and cosine functions.
 (See `Unit Circle <https://en.wikipedia.org/wiki/Unit_circle>`__.)
-
 In this example, the current frame is used as the variable that induces the motion.
 ``frame`` is a :ref:`Simple Expression <drivers-simple-expressions>` that corresponds to
 ``bpy.context.scene.frame_current``.
@@ -66,7 +62,6 @@
 
 Create a custom function to get the square of a value (i.e. *value*\ :sup:`2`).
 Adding the function to the *Driver Namespace* allows it to be used from driver expressions.
-
 The *Driver Namespace* has a list of built-in functions for use in driver expressions,
 as well as constants such as π and e.
 These can be inspected via the Python Console::
@@ -98,7 +93,6 @@
 
 There are more custom function examples available in Blender's Text Editor
 :menuselection:`Templates --> Python --> Driver Functions`.
-
 Since :ref:`Simple Expressions <drivers-simple-expressions>` cannot access
 custom functions, using them only makes sense for complex computations.
 
@@ -258,7 +252,7 @@
       In the *Drivers* tab, configure both drivers to be the *Averaged Value* of
       a variable with the bone's Z location.
    #. Determine the range of the bone's motion in the World Z axis by moving it up so that it is
-      aligned with the top of the mesh when both keys are active. Here we will use [0.0 , 2.5].
+      aligned with the top of the mesh when both keys are active. Here we will use [0.0, 2.5].
    #. Configure the driver functions so that the *Value* of the shape keys (Y axis) is as
       desired for the bone's height (X axis).
 
@@ -267,8 +261,8 @@
       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.
+      #. 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`.
@@ -275,5 +269,5 @@
 
          .. 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*,
+         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/compositing/types/matte/channel_key.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/matte/channel_key.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/compositing/types/matte/channel_key.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -36,7 +36,7 @@
    This button selects the channel, defined by the *Color Space*, to use to determine the matte.
 
 Algorithm
-   Method to calculate the the difference between levels.
+   Method to calculate the difference between levels.
 
    :Max:
       Limit by the maximum of the other two channels other than the *Key Channel*.

Modified: trunk/blender_docs/manual/editors/3dview/toolbar/add_cone.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/toolbar/add_cone.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/editors/3dview/toolbar/add_cone.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -7,7 +7,7 @@
 .. admonition:: Reference
    :class: refbox
 
-   :Mode:      Object Mode Edit Mode
+   :Mode:      Object Mode and Edit Mode
    :Tool:      :menuselection:`Toolbar --> Add Cone`
 
 Interactively add a :ref:`cone mesh object <bpy.ops.mesh.primitive_cone_add>`.
@@ -51,7 +51,7 @@
              using the :doc:`/editors/3dview/controls/orientation` as a fallback.
    :Default: Align the object using the default :doc:`/editors/3dview/controls/orientation`.
 
-Snap to
+Snap To
    The target to use while :doc:`/editors/3dview/controls/snapping`.
 
    :Geometry: Snap to all types of geometry (vertices, edges, and faces).
@@ -67,6 +67,7 @@
 Auto Axis
    Select the closest axis when placing objects (surface overrides).
 
+
 .. rubric:: Base
 
 Origin
@@ -83,6 +84,7 @@
    :Free: Draws the length and width of the base using an unconstrained aspect.
    :Fixed: Draws the length and width of the base using a 1:1 aspect.
 
+
 .. rubric:: Height
 
 Origin
@@ -107,4 +109,4 @@
 
    :Triangle Fan: Fill with triangular faces which share a vertex in the middle.
    :N-gon: Fill with a single :term:`N-gon`.
-   :Nothing:  Do not fill. Creates only the outer ring of vertices.
+   :Nothing: Do not fill. Creates only the outer ring of vertices.

Modified: trunk/blender_docs/manual/editors/3dview/toolbar/add_cube.rst
===================================================================
--- trunk/blender_docs/manual/editors/3dview/toolbar/add_cube.rst	2021-02-06 00:23:09 UTC (rev 7727)
+++ trunk/blender_docs/manual/editors/3dview/toolbar/add_cube.rst	2021-02-08 04:01:28 UTC (rev 7728)
@@ -7,7 +7,7 @@
 .. admonition:: Reference
    :class: refbox
 
-   :Mode:      Object Mode Edit Mode
+   :Mode:      Object Mode and Edit Mode
    :Tool:      :menuselection:`Toolbar --> Add Cube`
 
 Interactively add a :ref:`cube mesh object <bpy.ops.mesh.primitive_cube_add>`.
@@ -51,7 +51,7 @@
              using the :doc:`/editors/3dview/controls/orientation` as a fallback.
    :Default: Align the object using the default :doc:`/editors/3dview/controls/orientation`.
 
-Snap to
+Snap To
    The target to use while :doc:`/editors/3dview/controls/snapping`.
 
    :Geometry: Snap to all types of geometry (vertices, edges, and faces).
@@ -67,6 +67,7 @@
 Auto Axis

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list