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

[Alaska]

Revision: 9330
          https://developer.blender.org/rBM9330
Author:   Alaska
Date:     2022-06-01 06:05:28 +0200 (Wed, 01 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

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-06-01 04:04:44 UTC (rev 9329)
+++ trunk/blender_docs	2022-06-01 04:05:28 UTC (rev 9330)

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-9326
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9329
\ 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-01 04:04:44 UTC (rev 9329)
+++ trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst	2022-06-01 04:05:28 UTC (rev 9330)
@@ -216,6 +216,9 @@
    - 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.
+
    - MNEE Caustics only work if the caustic caster has smooth normals.
 
    - Volumetric materials can not considered when calculating MNEE caustics.

Modified: trunk/blender_docs/manual/render/shader_nodes/input/ao.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/ao.rst	2022-06-01 04:04:44 UTC (rev 9329)
+++ trunk/blender_docs/manual/render/shader_nodes/input/ao.rst	2022-06-01 04:05:28 UTC (rev 9330)
@@ -12,9 +12,15 @@
 This can be used for procedural texturing, for example to add weathering effects to corners only.
 
 For Cycles, this is an expensive shader and can slow down render significantly.
-If render time is a concern, using Pointiness from the Geometry node or baking Ambient Occlusion will render faster.
+If render time is a concern, using Pointiness from the Geometry node or baking Ambient Occlusion will result
+in faster renders.
 
+.. 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>`.
+
 Inputs
 ======