[Bf-docboard-svn] bf-manual: [9446] trunk/blender_docs/manual: Merge branch 'blender-3.3-release'
Aaron Carlisle
noreply at blender.org
Mon Aug 1 03:10:31 CEST 2022
Revision: 9446
https://developer.blender.org/rBM9446
Author: Blendify
Date: 2022-08-01 03:10:31 +0200 (Mon, 01 Aug 2022)
Log Message:
-----------
Merge branch 'blender-3.3-release'
Modified Paths:
--------------
trunk/blender_docs/manual/compositing/types/converter/index.rst
trunk/blender_docs/manual/editors/outliner/interface.rst
trunk/blender_docs/manual/editors/preferences/save_load.rst
trunk/blender_docs/manual/editors/texture_node/types/color/index.rst
trunk/blender_docs/manual/files/import_export/obj.rst
trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst
trunk/blender_docs/manual/modeling/geometry_nodes/utilities/random_value.rst
trunk/blender_docs/manual/render/shader_nodes/converter/index.rst
trunk/blender_docs/manual/sculpt_paint/curves_sculpting/tools/index.rst
Added Paths:
-----------
trunk/blender_docs/manual/compositing/types/converter/combine_color.rst
trunk/blender_docs/manual/compositing/types/converter/combine_xyz.rst
trunk/blender_docs/manual/compositing/types/converter/separate_color.rst
trunk/blender_docs/manual/compositing/types/converter/separate_xyz.rst
trunk/blender_docs/manual/editors/texture_node/types/color/combine_color.rst
trunk/blender_docs/manual/editors/texture_node/types/color/separate_color.rst
trunk/blender_docs/manual/images/node-types_FunctionNodeCombineColor.png
trunk/blender_docs/manual/images/node-types_FunctionNodeSeparateColor.png
trunk/blender_docs/manual/modeling/geometry_nodes/color/combine_color.rst
trunk/blender_docs/manual/modeling/geometry_nodes/color/separate_color.rst
trunk/blender_docs/manual/render/shader_nodes/converter/combine_color.rst
trunk/blender_docs/manual/render/shader_nodes/converter/combine_xyz.rst
trunk/blender_docs/manual/render/shader_nodes/converter/separate_color.rst
trunk/blender_docs/manual/render/shader_nodes/converter/separate_xyz.rst
Removed Paths:
-------------
trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst
trunk/blender_docs/manual/editors/texture_node/types/color/combine_separate.rst
trunk/blender_docs/manual/modeling/geometry_nodes/color/combine_rgb.rst
trunk/blender_docs/manual/modeling/geometry_nodes/color/separate_rgb.rst
trunk/blender_docs/manual/render/shader_nodes/converter/combine_separate.rst
Property Changed:
----------------
trunk/blender_docs/
Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs 2022-08-01 01:08:56 UTC (rev 9445)
+++ trunk/blender_docs 2022-08-01 01:10:31 UTC (rev 9446)
Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,5 ##
/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-9417
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9417
+/branches/blender-3.3-release/blender_docs:9438-9445
\ No newline at end of property
Copied: trunk/blender_docs/manual/compositing/types/converter/combine_color.rst (from rev 9445, branches/blender-3.3-release/blender_docs/manual/compositing/types/converter/combine_color.rst)
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/combine_color.rst (rev 0)
+++ trunk/blender_docs/manual/compositing/types/converter/combine_color.rst 2022-08-01 01:10:31 UTC (rev 9446)
@@ -0,0 +1,84 @@
+.. _bpy.types.CompositorNodeCombineColor:
+.. index:: Compositor Nodes; Combine Color
+.. Editors Note: This page gets copied into :doc:`</render/cycles/nodes/types/converter/combine_separate>`
+
+******************
+Combine Color Node
+******************
+
+.. figure:: /images/node-types_FunctionNodeCombineColor.png
+ :align: right
+ :alt: Combine Color Node.
+
+The *Combine Color Node* combines an image from its composite color channels.
+The node can combine multiple :term:`Color Models <Color Model>` depending on the Mode property.
+
+
+Inputs
+======
+
+The outputs of this node depends on the Mode property (see below).
+
+Alpha
+ The color channel that that is responsible for the image's transparency.
+
+
+Properties
+==========
+
+Mode
+ The color model to output.
+
+ :RGB: Combine the three inputs: Red, Green, and Blue color channels into a single image.
+ :HSV: Combine the three inputs: Hue, Saturation, and Value color channels into a single image.
+ :HSL: Combine the three inputs: Hue, Saturation, and Lightness color channels into a single image.
+ :YCbCrA:
+ Combine the three inputs: Luminance, Chrominance Blue, and Chrominance Red color channels into a single image.
+
+ Color Space
+ ITU 601, ITU 709, JPEG
+ :YUV: Combine the three inputs: Luminance, U chrominance, and V chrominance color channels into a single image.
+
+
+Output
+======
+
+Image
+ Standard image output.
+
+
+Examples
+========
+
+Blur Alpha
+----------
+
+.. figure:: /images/compositing_types_converter_combine-separate_example-combine-rgba.png
+ :width: 640px
+
+ An example of blurring the alpha channel.
+
+In this first example, we take the Alpha channel and blur it,
+and then combine it back with the colors. When placed in a scene,
+the edges of it will blend in, instead of having a hard edge.
+This is almost like :term:`Anti-Aliasing` but in a three-dimensional sense.
+Use this node setup, when adding CG elements to live action to remove any hard edges.
+Animating this effect on a broader scale will make the object appear to "phase" in and out,
+as an "out-of-phase" time-traveling sync effect.
+
+
+Increase Luminance
+------------------
+
+.. figure:: /images/compositing_types_converter_math_multiply.png
+
+ An example of the scaling the Luminance channel.
+
+This example has a *Math (Multiply)* node increasing the luminance channel (Y)
+of the image to make it brighter.
+
+.. tip::
+
+ If running these channels through a *Color Ramp* node to adjust value,
+ use the Cardinal scale for accurate representation.
+ Using the Exponential scale on the luminance channel gives a high-contrast effect.
Deleted: trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst 2022-08-01 01:08:56 UTC (rev 9445)
+++ trunk/blender_docs/manual/compositing/types/converter/combine_separate.rst 2022-08-01 01:10:31 UTC (rev 9446)
@@ -1,212 +0,0 @@
-.. _bpy.types.CompositorNodeSep:
-.. _bpy.types.CompositorNodeComb:
-.. Editors Note: This page gets copied into :doc:`</render/cycles/nodes/types/converter/combine_separate>`
-
-.. --- copy below this line ---
-
-**********************
-Combine/Separate Nodes
-**********************
-
-All of these nodes do essentially the same thing:
-
-- Separate: Split out an image into its composite color channels.
-- 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 Model`.
-
-In compositing and texture context each node supports the Alpha channel.
-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 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`.
-
-
-Separate/Combine RGBA Nodes
-===========================
-
-.. figure:: /images/compositing_node-types_CompositorNodeCombRGBA.webp
- :align: right
- :alt: Combine RGBA Node.
-
-.. figure:: /images/compositing_node-types_CompositorNodeSepRGBA.webp
- :align: right
- :alt: Separate RGBA Node.
-
-
-Input/Output
-------------
-
-Image
- Standard image in/output.
-
-- R (Red)
-- G (Green)
-- B (Blue)
-- A (Alpha)
-
-
-Properties
-----------
-
-This node has no properties.
-
-
-Examples
---------
-
-.. figure:: /images/compositing_types_converter_combine-separate_example-combine-rgba.png
- :width: 640px
-
- An example of blurring the alpha channel.
-
-In this first example, we take the Alpha channel and blur it,
-and then combine it back with the colors. When placed in a scene,
-the edges of it will blend in, instead of having a hard edge.
-This is almost like :term:`Anti-Aliasing` but in a three-dimensional sense.
-Use this node setup, when adding CG elements to live action to remove any hard edges.
-Animating this effect on a broader scale will make the object appear to "phase" in and out,
-as an "out-of-phase" time-traveling sync effect.
-
-
-Separate/Combine XYZ Nodes
-==========================
-
-.. figure:: /images/compositing_node-types_CompositorNodeCombineXYZ.webp
- :width: 190px
- :align: right
- :alt: Combine XYZ Node.
-
-.. figure:: /images/compositing_node-types_CompositorNodeSeparateXYZ.webp
- :width: 190px
- :align: right
- :alt: Separate XYZ Node.
-
-
-Input/Output
-------------
-
-Image
- Standard vector in/output.
-
-- X (X Vector)
-- Y (Y Vector)
-- Z (Z Vector)
-
-
-Properties
-----------
-
-This node has no properties.
-
-
-Separate/Combine HSVA Nodes
-===========================
-
-.. figure:: /images/compositing_node-types_CompositorNodeCombHSVA.webp
- :align: right
- :alt: Combine HSVA Node.
-
-.. figure:: /images/compositing_node-types_CompositorNodeSepHSVA.webp
- :align: right
- :alt: Separate HSVA Node.
-
-
-Input/Output
-------------
-
-Image
- Standard image in/output.
-
-- H (Hue)
-- S (Saturation)
-- V (Value)
-- A (Alpha)
-
-
-Properties
-----------
-
-This node has no properties.
-
-
-Separate/Combine YUVA Nodes
-===========================
-
-.. figure:: /images/compositing_node-types_CompositorNodeCombYUVA.webp
- :align: right
- :alt: Combine YUVA Node.
-
-.. figure:: /images/compositing_node-types_CompositorNodeSepYUVA.webp
- :align: right
- :alt: Separate YUVA Node.
-
-
-Input/Output
-------------
-
-Image
- Standard image in/output.
-
-- Y (Luminance)
-- U (U chrominance)
-- V (V chrominance)
-- A (Alpha)
-
-
-Properties
-----------
-
-This node has no properties.
-
-
-Separate/Combine YCbCrA Node
-============================
-
-.. figure:: /images/compositing_node-types_CompositorNodeCombYCCA.webp
- :align: right
- :alt: Combine YCbCrA Node.
-
-.. figure:: /images/compositing_node-types_CompositorNodeSepYCCA.webp
- :align: right
- :alt: Separate YCbCrA Node.
-
-
-Input/Output
-------------
-
-Image
- Standard image in/output.
-
-- Y (Luminance)
-- Cb (Chrominance Blue)
-- Cr (Chrominance Red)
-- A (Alpha)
-
-
-Properties
-----------
-
-Mode
- ITU 601, ITU 709, JPEG
-
-
-Examples
---------
-
-.. figure:: /images/compositing_types_converter_math_multiply.png
-
- An example of the scaling the Luminance channel.
-
-This example has a *Math (Multiply)* node increasing the luminance channel (Y)
-of the image to make it brighter.
-
-.. tip::
-
- If running these channels through a *Color Ramp* node to adjust value,
- use the Cardinal scale for accurate representation.
- Using the Exponential scale on the luminance channel gives a high-contrast effect.
Copied: trunk/blender_docs/manual/compositing/types/converter/combine_xyz.rst (from rev 9445, branches/blender-3.3-release/blender_docs/manual/compositing/types/converter/combine_xyz.rst)
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/combine_xyz.rst (rev 0)
+++ trunk/blender_docs/manual/compositing/types/converter/combine_xyz.rst 2022-08-01 01:10:31 UTC (rev 9446)
@@ -0,0 +1,37 @@
+.. _bpy.types.CompositorNodeCombineXYZ:
+.. index:: Compositor Nodes; Combine XYZ
+
+****************
+Combine XYZ Node
+****************
+
+.. figure:: /images/compositing_node-types_CompositorNodeCombineXYZ.webp
+ :align: right
+ :alt: Combine XYZ Node.
+
+The *Combine XYZ Node* combines a vector from its individual components.
+
+
+Inputs
+======
+
+- X
+- Y
+- Z
+
+
+Properties
+==========
+
+This node has no properties.
+
+
+Output
+======
+
+Vector
+ Standard vector output.
+
+.. note::
+
+ The vector is not normalized.
Modified: trunk/blender_docs/manual/compositing/types/converter/index.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/converter/index.rst 2022-08-01 01:08:56 UTC (rev 9445)
+++ trunk/blender_docs/manual/compositing/types/converter/index.rst 2022-08-01 01:10:31 UTC (rev 9446)
@@ -18,9 +18,12 @@
alpha_convert.rst
color_space.rst
color_ramp.rst
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list