[Bf-docboard-svn] bf-manual: [9332] trunk/blender_docs/manual/render/shader_nodes/input: Merge branch 'blender-3.2-release'

[Alaska]

Revision: 9332
          https://developer.blender.org/rBM9332
Author:   Alaska
Date:     2022-06-02 05:04:18 +0200 (Thu, 02 Jun 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst
    trunk/blender_docs/manual/render/shader_nodes/input/ao.rst
    trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-06-02 03:03:07 UTC (rev 9331)
+++ trunk/blender_docs	2022-06-02 03:04:18 UTC (rev 9332)

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-9329
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9331
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst	2022-06-02 03:03:07 UTC (rev 9331)
+++ trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst	2022-06-02 03:04:18 UTC (rev 9332)
@@ -216,8 +216,10 @@
    - MNEE Caustic rays can pass through up to 6 Caustic Caster surfaces between a Caustic Reciever and a
      Shadow Caustic light before the ray is terminated and caustics are ignored.
 
-   - The :ref:`Ambient Occlusion <bpy.types.ShaderNodeAmbientOcclusion>` node will not produce a valid result
-     while an object is either a Caustic caster or Caustic receiver.
+   - The :ref:`Ambient Occlusion <bpy.types.ShaderNodeAmbientOcclusion>` and 
+     :ref:`Bevel <bpy.types.ShaderNodeBevel>` nodes will not produce a valid result on objects that are
+     a Caustic caster or Caustic receiver while the scene contains a active Caustic caster,
+     Caustic receiver, and :ref:`Shadow Caustic Light<bpy.types.CyclesLightSettings.is_caustics_light>`.
 
    - MNEE Caustics only work if the caustic caster has smooth normals.
 

Modified: trunk/blender_docs/manual/render/shader_nodes/input/ao.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/ao.rst	2022-06-02 03:03:07 UTC (rev 9331)
+++ trunk/blender_docs/manual/render/shader_nodes/input/ao.rst	2022-06-02 03:04:18 UTC (rev 9332)
@@ -18,8 +18,12 @@
 .. note:: 
 
    :guilabel:`Cycles Only`
-   The Ambient Occlusion node will not produce a valid result while an object is either a
-   :ref:`Caustic caster or Caustic receiver <bpy.types.CyclesObjectSettings.is_caustics_caster>`.
+   The Ambient Occlusion node will not produce a valid result on objects that are either a
+   :ref:`Caustic caster <bpy.types.CyclesObjectSettings.is_caustics_caster>` or
+   :ref:`Caustic receiver <bpy.types.CyclesObjectSettings.is_caustics_receiver>` while the scene contains
+   a active :ref:`Caustic caster <bpy.types.CyclesObjectSettings.is_caustics_caster>`,
+   :ref:`Caustic receiver <bpy.types.CyclesObjectSettings.is_caustics_receiver>`, and
+   :ref:`Shadow Caustic Light<bpy.types.CyclesLightSettings.is_caustics_light>`.
 
 Inputs
 ======

Modified: trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst	2022-06-02 03:03:07 UTC (rev 9331)
+++ trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst	2022-06-02 03:04:18 UTC (rev 9332)
@@ -20,7 +20,16 @@
 still frame renders where render time is not as much of an issue.
 The Bevel modifier is a faster option when it works, but sometimes fails on complex or messy geometry.
 
+.. note:: 
 
+   The Bevel node will not produce a valid result on objects that are either a
+   :ref:`Caustic caster <bpy.types.CyclesObjectSettings.is_caustics_caster>` or
+   :ref:`Caustic receiver <bpy.types.CyclesObjectSettings.is_caustics_receiver>` while the scene contains
+   a active :ref:`Caustic caster <bpy.types.CyclesObjectSettings.is_caustics_caster>`,
+   :ref:`Caustic receiver <bpy.types.CyclesObjectSettings.is_caustics_receiver>`, and
+   :ref:`Shadow Caustic Light<bpy.types.CyclesLightSettings.is_caustics_light>`.
+
+
 Inputs
 ======