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

Aaron Carlisle noreply at blender.org
Wed May 11 02:49:16 CEST 2022 

Revision: 9275
          https://developer.blender.org/rBM9275
Author:   Blendify
Date:     2022-05-11 02:49:15 +0200 (Wed, 11 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/compositing/types/color/hue_saturation.rst
    trunk/blender_docs/manual/compositing/types/converter/color_space.rst
    trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst
    trunk/blender_docs/manual/compositing/types/matte/channel_key.rst
    trunk/blender_docs/manual/editors/image/image_settings.rst
    trunk/blender_docs/manual/editors/image/introduction.rst
    trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst
    trunk/blender_docs/manual/files/media/video_formats.rst
    trunk/blender_docs/manual/glossary/index.rst
    trunk/blender_docs/manual/interface/controls/templates/color_picker.rst
    trunk/blender_docs/manual/interface/controls/templates/color_ramp.rst
    trunk/blender_docs/manual/modeling/meshes/properties/object_data.rst
    trunk/blender_docs/manual/modeling/modifiers/common_options.rst
    trunk/blender_docs/manual/modeling/modifiers/introduction.rst
    trunk/blender_docs/manual/render/color_management.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/environment.rst
    trunk/blender_docs/manual/render/shader_nodes/textures/image.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs	2022-05-11 00:49:15 UTC (rev 9275)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /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
-/branches/blender-3.2-release/blender_docs:9236-9269
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9274
\ No newline at end of property
Modified: trunk/blender_docs/manual/compositing/types/color/hue_saturation.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/color/hue_saturation.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/compositing/types/color/hue_saturation.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -12,7 +12,7 @@
    :align: right
    :alt: Hue Saturation Node.
 
-The *Hue Saturation Value Node* applies a color transformation in the HSV color space.
+The *Hue Saturation Value Node* applies a color transformation in the HSV :term:`Color Model`.
 
 
 Inputs

Modified: trunk/blender_docs/manual/compositing/types/converter/color_space.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/color_space.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/compositing/types/converter/color_space.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -12,8 +12,8 @@
 
 .. note::
 
-    Images are automatically converted into linear color space unless specified in the image's
-    :ref:`Colorspace <bpy.types.ColorManagedInputColorspaceSettings.name>` option.
+    Images are already automatically converted into linear color space unless specified in the image's
+    :ref:`Color Space <bpy.types.ColorManagedInputColorspaceSettings.name>` option.
 
 
 Inputs
@@ -30,17 +30,10 @@
    The color space of the input image and the color space to convert the image to.
 
    The list of color spaces depends on the active :ref:`OCIO config <ocio-config>`.
-   Using the default config will list the following options:
+   The default supported color spaces are described in detail here:
+   :ref:`Default OpenColorIO Configuration <ocio-config-default-color-spaces>`
 
-   :sRGB: Standard RGB display space.
-   :Linear: Linear 709 (full range). Blender native linear space.
-   :Linear ACES: ACES linear space.
-   :XYZ: Standard linear XYZ space.
-   :Non-Color: Color space used for images which contains non-color data (e.g. normal maps).
-   :Raw: Does not automatically convert to linear; same as Non-Color.
-   :Filmic Log: Intermediate log color space of Filmic view transform.
 
-
 Outputs
 =======
 

Modified: trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -14,15 +14,15 @@
 - Combine: Re/combine an image from its composite color channels.
 
 These nodes can be used to manipulate each color channel independently.
-Each type is differentiated in the applied :term:`Color Space`.
+Each type is differentiated in the applied :term:`Color Model`.
 
 In compositing and texture context each node supports the Alpha channel.
-In the texture context only RGB color space is available.
+In the texture context only RGB channels are available.
 In the shading context of Cycles and Eevee, a combine and separate node is added
 for HSV.
 
 The Combine nodes can also be used to input single color values.
-For RGBA and HSVA color spaces it is recommended to use the :doc:`/compositing/types/input/rgb`.
+For RGBA and HSVA color models it is recommended to use the :doc:`/compositing/types/input/rgb`.
 Some common operations could easier be executed with the :doc:`/compositing/types/color/index`.
 
 

Modified: trunk/blender_docs/manual/compositing/types/matte/channel_key.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/matte/channel_key.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/compositing/types/matte/channel_key.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -11,8 +11,8 @@
 The *Channel Key* node determines background objects from foreground objects by
 the difference in the selected channel's levels.
 
-For example in YUV color space,
-this is useful when compositing stock footage of explosions (very bright)
+For example in the YUV :term:`Color Model`,
+this node is useful when compositing stock footage of explosions (very bright)
 which are normally shot against a solid, dark background.
 
 
@@ -27,7 +27,7 @@
 ==========
 
 Color Space
-   This button selects what color space the channels will represent.
+   This button selects what color model the channels will represent.
 
    RGB, HSV, YUV, YCbCr
 

Modified: trunk/blender_docs/manual/editors/image/image_settings.rst
===================================================================
--- trunk/blender_docs/manual/editors/image/image_settings.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/editors/image/image_settings.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -137,17 +137,16 @@
    Once loaded into Blender, the color will be treated as linear color.
    This option ensure the correct conversion to linear color is used.
 
+   Texture's color, and final renders are  often stored in sRGB,
+   while OpenEXR images are stored in a linear color space.
+   Some images such as normal, bump or stencil maps do not strictly contain 'colors',
+   and on such values, no color space conversion should ever be applied.
+   For such images, the color space should be set to *Non-Color*.
+
    The list of color spaces depends on the active :ref:`OCIO config <ocio-config>`.
-   Using the default config will list the following options:
+   The default supported color spaces are described in detail here:
+   :ref:`Default OpenColorIO Configuration <ocio-config-default-color-spaces>`
 
-   :sRGB: Standard RGB display space.
-   :Linear: Linear 709 (full range). Blender native linear space.
-   :Linear ACES: ACES linear space.
-   :XYZ: Standard linear XYZ space.
-   :Non-Color: Color space used for images which contains non-color data (e.g. normal maps).
-   :Raw: Does not automatically convert to linear; same as Non-Color.
-   :Filmic Log: Intermediate log color space of Filmic view transform.
-
 .. _bpy.types.Image.alpha_mode:
 
 Alpha

Modified: trunk/blender_docs/manual/editors/image/introduction.rst
===================================================================
--- trunk/blender_docs/manual/editors/image/introduction.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/editors/image/introduction.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -92,4 +92,4 @@
 =========
 
 When :kbd:`LMB` / :kbd:`RMB` dragging mouse the color under the cursor is shown in the footer as well the cursor
-position and the color values in the RGBA, HSV and Luminance :term:`Color Space`.
+position and the color values in the RGBA, HSV and Luminance :term:`Color Model`.

Modified: trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst
===================================================================
--- trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/editors/video_sequencer/sequencer/sidebar/strip.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -219,6 +219,10 @@
    based on the specified amount of previous frames (e.g. 15 for MPEG-2 DVD).
 Color Space
    To specify the color space of the source file.
+
+   The list of color spaces depends on the active :ref:`OCIO config <ocio-config>`.
+   The default supported color spaces are described in detail here:
+   :ref:`Default OpenColorIO Configuration <ocio-config-default-color-spaces>`
 Alpha Mode
    If the source file has an Alpha (transparency) channel, you can choose:
 

Modified: trunk/blender_docs/manual/files/media/video_formats.rst
===================================================================
--- trunk/blender_docs/manual/files/media/video_formats.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/files/media/video_formats.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -25,7 +25,7 @@
 
 .. note::
 
-   Most codecs can only compress the RGB or YUV :term:`Color Space`,
+   Most codecs can only compress the RGB or YUV colors,
    but some support the Alpha channel as well. Codecs that support RGBA include:
 
    - `FFmpeg video codec #1 <https://en.wikipedia.org/wiki/FFV1>`__

Modified: trunk/blender_docs/manual/glossary/index.rst
===================================================================
--- trunk/blender_docs/manual/glossary/index.rst	2022-05-11 00:47:10 UTC (rev 9274)
+++ trunk/blender_docs/manual/glossary/index.rst	2022-05-11 00:49:15 UTC (rev 9275)
@@ -218,9 +218,13 @@
       - The :term:`White Point`
       - A transfer function
 
+      The color spaces supported by Blender depend on the active :ref:`OCIO config <ocio-config>`.
+      The default supported color spaces are described in detail here:
+      :ref:`Default OpenColorIO Configuration <ocio-config-default-color-spaces>`
+
       sRGB
-         A color space that uses the Rec .709 :term:`Primaries` and white point but,
-         with a slightly different transfer function.
+         A color space that uses the Rec .709 :term:`Primaries` and a D65 white point,
+         and 2.2 gamma correction value as the transfer function.
 
    Concave Face
       Face in which one vertex is inside a triangle formed by other vertices of the face.

Modified: trunk/blender_docs/manual/interface/controls/templates/color_picker.rst
===================================================================
--- trunk/blender_docs/manual/interface/controls/templates/color_picker.rst	2022-05-11 00:47:10 UTC (rev 9274)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-docboard-svn mailing list