[Bf-docboard-svn] bf-manual: [9574] trunk/blender_docs/manual: Nodes: Add pages for new Mix Node

Tue Sep 20 23:44:19 CEST 2022

Revision: 9574
          https://developer.blender.org/rBM9574
Author:   charlie
Date:     2022-09-20 23:44:18 +0200 (Tue, 20 Sep 2022)
Log Message:
-----------
Nodes: Add pages for new Mix Node

Modified Paths:
--------------
    trunk/blender_docs/manual/compositing/types/color/mix.rst
    trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst
    trunk/blender_docs/manual/render/shader_nodes/converter/index.rst

Added Paths:
-----------
    trunk/blender_docs/manual/images/render_shader-nodes_shader_mix_node.jpg
    trunk/blender_docs/manual/modeling/geometry_nodes/utilities/mix.rst
    trunk/blender_docs/manual/render/shader_nodes/converter/mix.rst

Modified: trunk/blender_docs/manual/compositing/types/color/mix.rst
===================================================================

--- trunk/blender_docs/manual/compositing/types/color/mix.rst	2022-09-20 04:26:21 UTC (rev 9573)
+++ trunk/blender_docs/manual/compositing/types/color/mix.rst	2022-09-20 21:44:18 UTC (rev 9574)
@@ -2,6 +2,8 @@
 .. Editors Note: This page gets copied into:
 .. - :doc:`</render/cycles/nodes/types/color/mix>`
 .. - :doc:`</modeling/geometry_nodes/color/mix_rgb>`
+.. - :doc:`</render/shader_nodes/converter/mix>`
+.. - :doc:`</modeling/geometry_nodes/utilities/mix>`
 
 .. --- copy below this line ---
 
@@ -14,8 +16,12 @@
    :alt: Mix Node.
 
 The *Mix Node* mixes images by working on the individual and corresponding pixels
-of the two input images. Called "MixRGB" in the shader, geometry, and texture context.
+of the two input images. Called "Mix Color" in the shader, geometry, and texture context.
 
+  .. important::
+  
+     As of Blender 3.4 this node has been updated in Shader and Geometry node editors.
+     Files saved with the new node are not forward compatible.
 
 Inputs
 ======

Added: trunk/blender_docs/manual/images/render_shader-nodes_shader_mix_node.jpg
===================================================================
(Binary files differ)

Index: trunk/blender_docs/manual/images/render_shader-nodes_shader_mix_node.jpg
===================================================================
--- trunk/blender_docs/manual/images/render_shader-nodes_shader_mix_node.jpg	2022-09-20 04:26:21 UTC (rev 9573)
+++ trunk/blender_docs/manual/images/render_shader-nodes_shader_mix_node.jpg	2022-09-20 21:44:18 UTC (rev 9574)

Property changes on: trunk/blender_docs/manual/images/render_shader-nodes_shader_mix_node.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst	2022-09-20 04:26:21 UTC (rev 9573)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/utilities/index.rst	2022-09-20 21:44:18 UTC (rev 9574)
@@ -19,6 +19,7 @@
    interpolate_domain.rst
    map_range.rst
    math.rst
+   mix.rst
    random_value.rst
    rotate_euler.rst
    switch.rst

Added: trunk/blender_docs/manual/modeling/geometry_nodes/utilities/mix.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/utilities/mix.rst	                        (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/utilities/mix.rst	2022-09-20 21:44:18 UTC (rev 9574)
@@ -0,0 +1,4 @@
+.. index:: Geometry Nodes; Mix
+.. DO NOT EDIT FILE. This is simply a stub which copies everything from the link below.
+.. include:: /render/shader_nodes/converter/mix.rst
+   :start-after: .. --- copy below this line ---


Property changes on: trunk/blender_docs/manual/modeling/geometry_nodes/utilities/mix.rst
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/shader_nodes/converter/index.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/converter/index.rst	2022-09-20 04:26:21 UTC (rev 9573)
+++ trunk/blender_docs/manual/render/shader_nodes/converter/index.rst	2022-09-20 21:44:18 UTC (rev 9574)
@@ -14,6 +14,7 @@
    float_curve.rst
    map_range.rst
    math.rst
+   mix.rst
    rgb_to_bw.rst
    separate_color.rst
    separate_xyz.rst

Added: trunk/blender_docs/manual/render/shader_nodes/converter/mix.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/converter/mix.rst	                        (rev 0)
+++ trunk/blender_docs/manual/render/shader_nodes/converter/mix.rst	2022-09-20 21:44:18 UTC (rev 9574)
@@ -0,0 +1,75 @@
+.. _bpy.types.ShaderNodeMix:
+.. Editors Note: This page gets copied into:
+.. - :doc:`</modeling/geometry_nodes/utilities/mix>`
+
+.. --- copy below this line ---
+
+********
+Mix Node
+********
+
+The *Mix Node* mixes values, colors and vectors inputs 
+using a factor to control the amount of interpolation.
+The *Color* mode has additional blending modes.
+
+.. figure:: /images/render_shader-nodes_shader_mix_node.jpg
+   :align: right
+   :alt: Mix Node.
+
+.. important::
+  
+   This is a new node as of Blender 3.4. The previous *Mix RGB* node 
+   is automatically converted to the Color version of this node in 
+   Shader and Geometry node editors.
+   Files saved with the new node are not forward compatible.
+
+Inputs
+======
+
+Factor
+   Controls the amount of mixing between the A and B inputs.
+A/B
+   The two inputs that are mixed together.
+
+
+Properties
+==========
+
+Data Type
+   The data type that is used for mixing. The node supports float, 
+   vector and color data types.
+   
+Factor Mode (Vector only)
+   The factor mode can be set to *Uniform* and *Non-Uniform*.   
+   In uniform mode, a single float controls the factor.
+   In non-uniform mode, a vector controls the factor for
+   each XYZ channel separately.
+
+Mix (Color only)
+   The Blend modes can be selected in the select menu.
+   See :term:`Color Blend Modes` for details on each blending mode.
+
+   Add, Subtract, Multiply, Screen, Divide, Difference,
+   Darken, Lighten, Overlay, Color Dodge, Color Burn,
+   Hue, Saturation, Value, Color, Soft Light, Linear Light
+
+Clamp Factor
+   Limit the factor value between 0.0 and 1.0. If this option is 
+   unchecked then the node operates using *Extrapolation*.
+
+Clamp Result (Color only)
+   Limit the Result to the range between 0.0 and 1.0.
+
+Outputs
+=======
+
+Result
+   Output the result of the mix using the data type selected.
+
+
+Examples
+========
+
+See the Color > Mix page for additional examples: 
+:doc:`Mix Color Node </render/shader_nodes/color/mix>`
+   


Property changes on: trunk/blender_docs/manual/render/shader_nodes/converter/mix.rst
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
