[Bf-docboard-svn] bf-manual: [8337] trunk/blender_docs/manual: Geometry Nodes: Add shader Color Mix node

[Aaron Carlisle]

Revision: 8337
          https://developer.blender.org/rBM8337
Author:   Blendify
Date:     2021-08-20 23:39:58 +0200 (Fri, 20 Aug 2021)
Log Message:
-----------
Geometry Nodes: Add shader Color Mix node

rB04376c3bac796c9fb4bc2e33150484e357a65eab

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

Added Paths:
-----------
    trunk/blender_docs/manual/modeling/geometry_nodes/color/mix_rgb.rst

Modified: trunk/blender_docs/manual/compositing/types/color/mix.rst
===================================================================
--- trunk/blender_docs/manual/compositing/types/color/mix.rst	2021-08-20 19:47:33 UTC (rev 8336)
+++ trunk/blender_docs/manual/compositing/types/color/mix.rst	2021-08-20 21:39:58 UTC (rev 8337)
@@ -2,6 +2,7 @@
 .. Editors Note: This page gets copied into:
 .. - :doc:`</render/cycles/nodes/types/color/mix>`
 .. - :doc:`</physics/simulation/nodes/color/mix_rgb>`
+.. - :doc:`</modeling/geometry_nodes/color/mix_rgb>`
 
 .. --- copy below this line ---
 
@@ -15,7 +16,7 @@
    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 and texture context.
+of the two input images. Called "MixRGB" in the shader, geometry, and texture context.
 
 
 Inputs

Modified: trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst	2021-08-20 19:47:33 UTC (rev 8336)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/color/index.rst	2021-08-20 21:39:58 UTC (rev 8337)
@@ -7,6 +7,7 @@
    :maxdepth: 1
 
    color_ramp.rst
-   combine_rgb.rst
+   combine_rgb.rst  
+   mix_rgb.rst
+   rgb_curves.rst
    separate_rgb.rst
-   rgb_curves.rst

Added: trunk/blender_docs/manual/modeling/geometry_nodes/color/mix_rgb.rst
===================================================================
--- trunk/blender_docs/manual/modeling/geometry_nodes/color/mix_rgb.rst	                        (rev 0)
+++ trunk/blender_docs/manual/modeling/geometry_nodes/color/mix_rgb.rst	2021-08-20 21:39:58 UTC (rev 8337)
@@ -0,0 +1,4 @@
+.. _bpy.types.ShaderNodeRGBCurve:
+.. DO NOT EDIT FILE. This is simply a stub which copies everything from the link below.
+.. include:: /compositing/types/color/rgb_curves.rst
+   :start-after: .. --- copy below this line ---


Property changes on: trunk/blender_docs/manual/modeling/geometry_nodes/color/mix_rgb.rst
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property