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

Aaron Carlisle noreply at blender.org
Tue Feb 2 04:53:52 CET 2021 

Revision: 7705
          https://developer.blender.org/rBM7705
Author:   Blendify
Date:     2021-02-02 04:53:52 +0100 (Tue, 02 Feb 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/compositing/types/converter/set_alpha.rst
    trunk/blender_docs/manual/compositing/types/matte/channel_key.rst
    trunk/blender_docs/manual/grease_pencil/modes/draw/introduction.rst
    trunk/blender_docs/manual/images/grease-pencil_modes_draw_introduction_drawing-options.png
    trunk/blender_docs/manual/interface/keymap/blender_default.rst
    trunk/blender_docs/manual/interface/keymap/industry_compatible.rst
    trunk/blender_docs/resources/theme/css/theme_overrides.css

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs	2021-02-02 03:53:52 UTC (rev 7705)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7696
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7704
\ No newline at end of property
Modified: trunk/blender_docs/manual/compositing/types/converter/set_alpha.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/set_alpha.rst	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs/manual/compositing/types/converter/set_alpha.rst	2021-02-02 03:53:52 UTC (rev 7705)
@@ -25,9 +25,19 @@
 Properties
 ==========
 
-This node has no properties.
+.. _bpy.types.CompositorNodeSetAlpha.mode:
 
+Mode
+   Method to mix the alpha with the input *Image*.
 
+   :Apply Mask:
+      Multiply the input images RGBA channels by the *Alpha* input value.
+      In this cases, the output is using :term:`Premultiplied Alpha`.
+   :Replace Alpha:
+      Replace the inputs alpha channel with the *Alpha* input value.
+      In this cases, the output is using :term:`Straight Alpha`.
+
+
 Outputs
 =======
 

Modified: trunk/blender_docs/manual/compositing/types/matte/channel_key.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/matte/channel_key.rst	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs/manual/compositing/types/matte/channel_key.rst	2021-02-02 03:53:52 UTC (rev 7705)
@@ -31,22 +31,35 @@
    This button selects what color space the channels will represent.
 
    RGB, HSV, YUV, YCbCr
-Channel
-   This button selects the channel, defined by the Color Space, to use to determine the matte.
+
+Key Channel
+   This button selects the channel, defined by the *Color Space*, to use to determine the matte.
+
 Algorithm
-   Max, Single
-Limit
-   It is possible to have a separation between the two values to allow for a gradient of
-   transparency between foreground and background objects.
+   Method to calculate the the difference between levels.
 
-   High
-      Determines the lowest values that are considered foreground.
-      (Which is supposed to be -- relatively -- height values: from this value to 1.0.)
-   Low
-      Determines the highest values that are considered to be background objects.
-      (Which is supposed to be -- relatively -- low values: from 0.0 to this value.)
+   :Max:
+      Limit by the maximum of the other two channels other than the *Key Channel*.
+   :Single:
+      Limit by the maximum of the selected *Limiting Channel*.
 
+      Limiting Channel
+         The channel to use when computing the maximum, the options are defined by the *Color Space*.
 
+High
+   Determines the lowest values that are considered foreground.
+   (Which is supposed to be -- relatively -- height values: from this value to 1.0.)
+
+Low
+   Determines the highest values that are considered to be background objects.
+   (Which is supposed to be -- relatively -- low values: from 0.0 to this value.)
+
+.. tip::
+
+   It is possible to have a separation between the *High* and *Low* values to allow
+   for a gradient of transparency between foreground and background objects.
+
+
 Outputs
 =======
 

Modified: trunk/blender_docs/manual/grease_pencil/modes/draw/introduction.rst
===================================================================
--- trunk/blender_docs/manual/grease_pencil/modes/draw/introduction.rst	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs/manual/grease_pencil/modes/draw/introduction.rst	2021-02-02 03:53:52 UTC (rev 7705)
@@ -67,8 +67,6 @@
 See :doc:`Guides </grease_pencil/modes/draw/guides>` for more information.
 
 
-.. _bpy.types.ToolSettings.use_gpencil_draw_onback:
-.. _bpy.types.ToolSettings.use_gpencil_weight_data_add:
 .. _bpy.types.ToolSettings.use_gpencil_draw_additive:
 
 Drawing Options
@@ -83,6 +81,8 @@
    For example when you want to paint with a fill material below line strokes on a character and
    they are on the same layer.
 
+.. _bpy.types.ToolSettings.use_gpencil_weight_data_add:
+
 Add Weight Data
    When enabled, weight data is added to new strokes according to the current vertex group and weight.
    If there is no vertex group selected, no weight data is added.
@@ -92,7 +92,18 @@
 
    See :doc:`Weight Paint Mode </grease_pencil/modes/weight_paint/introduction>` for more information.
 
+.. _bpy.types.ToolSettings.use_gpencil_draw_onback:
+
 Additive Drawing
    When creating new frames adding strokes with drawing tools,
    the strokes from the previous/active frame are include as a basis for the new one.
    When erasing existing strokes using Additive Drawing a new keyframe will be added.
+
+.. _bpy.types.ToolSettings.use_gpencil_automerge_strokes:
+
+Automerge
+   Joins news stroke with the beginning or end of previously drawn strokes in the active layer.
+
+Interpolate
+   Popover that contains tools and properties to automatically add breakdown keyframes between normal keyframes.
+   See :doc:`Interpolating Strokes </grease_pencil/animation/interpolation>` for more information.

Modified: trunk/blender_docs/manual/images/grease-pencil_modes_draw_introduction_drawing-options.png
===================================================================
(Binary files differ)

Modified: trunk/blender_docs/manual/interface/keymap/blender_default.rst
===================================================================
--- trunk/blender_docs/manual/interface/keymap/blender_default.rst	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs/manual/interface/keymap/blender_default.rst	2021-02-02 03:53:52 UTC (rev 7705)
@@ -64,6 +64,18 @@
      - Playback animation (reverse).
 
 
+Common Editing Keys
+===================
+
+.. list-table::
+   :widths: 10 90
+
+   * - :kbd:`X`
+     - Deletes the selected item, requires a confirmation dialog.
+   * - :kbd:`Delete`
+     -  Deletes the selected item, does not require a confirmation dialog.
+
+
 Common Editor Keys
 ==================
 
@@ -128,8 +140,8 @@
 
 .. _keymap-blender_default-prefs:
 
-Preferences
-===========
+Keymap Preferences
+==================
 
 .. _keymap-blender_default-prefs-select_with:
 

Modified: trunk/blender_docs/manual/interface/keymap/industry_compatible.rst
===================================================================
--- trunk/blender_docs/manual/interface/keymap/industry_compatible.rst	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs/manual/interface/keymap/industry_compatible.rst	2021-02-02 03:53:52 UTC (rev 7705)
@@ -21,16 +21,10 @@
      - Menu Search.
    * - :kbd:`Shift-Tab`
      - Quick access (favorites)
-   * - :kbd:`Ctrl-D`
-     - Duplicate
-   * - :kbd:`P`
-     - Set Parent
    * - :kbd:`Return`
      - Rename
    * - :kbd:`Ctrl-Return`
      - Render
-   * - :kbd:`B`
-     - Proportional Editing / Soft Selection
    * - :kbd:`Ctrl-[`
      - Toggle Toolbar
    * - :kbd:`Ctrl-]`
@@ -37,6 +31,24 @@
      - Toggle Sidebar
 
 
+Common Editing Keys
+===================
+
+.. list-table::
+  :widths: 10 90
+
+  * - :kbd:`Backspace`
+    - Deletes the selected item, requires a confirmation dialog.
+  * - :kbd:`Delete`
+    -  Deletes the selected item, does not require a confirmation dialog.
+  * - :kbd:`Ctrl-D`
+    - Duplicate
+  * - :kbd:`P`
+    - Set Parent
+  * - :kbd:`B`
+    - Proportional Editing / Soft Selection
+
+
 Viewport
 ========
 

Modified: trunk/blender_docs/resources/theme/css/theme_overrides.css
===================================================================
--- trunk/blender_docs/resources/theme/css/theme_overrides.css	2021-02-02 03:51:42 UTC (rev 7704)
+++ trunk/blender_docs/resources/theme/css/theme_overrides.css	2021-02-02 03:53:52 UTC (rev 7705)
@@ -86,6 +86,16 @@
 	margin: 0;
 }
 
+/* Dont indent field lists */
+.rst-content dl.field-list dt {
+	padding-left: 0 !important;
+}
+
+/* Fix padding for normal definitions nested in field lists */
+.rst-content dl.field-list dd > dl.simple {
+	padding-top: 12px;
+}
+
 /* Without this, paragraphs in bullet points within definition lists have too much vertical padding. */
 .rst-content li > p {
 	margin-bottom: 0px !important;

More information about the Bf-docboard-svn mailing list