[Bf-docboard-svn] bf-manual: [9335] trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst: Merge branch 'blender-3.2-release'

[Alaska]

Revision: 9335
          https://developer.blender.org/rBM9335
Author:   Alaska
Date:     2022-06-02 10:37:16 +0200 (Thu, 02 Jun 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/render/cycles/gpu_rendering.rst
    trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst

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

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-06-02 08:36:12 UTC (rev 9334)
+++ trunk/blender_docs	2022-06-02 08:37:16 UTC (rev 9335)

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-9331
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9334
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/cycles/gpu_rendering.rst
===================================================================
--- trunk/blender_docs/manual/render/cycles/gpu_rendering.rst	2022-06-02 08:36:12 UTC (rev 9334)
+++ trunk/blender_docs/manual/render/cycles/gpu_rendering.rst	2022-06-02 08:37:16 UTC (rev 9335)
@@ -68,7 +68,9 @@
 Metal is supported on Apple computers with Apple Silicon or AMD graphics cards. macOS 12.2 is required to use Metal
 with Apple Silicon while macOS 12.3 is required to use Metal with AMD graphics cards.
 
+.. note:: :ref:`MNEE caustics <bpy.types.CyclesObjectSettings.is_caustics_caster>` are not supported in Metal.
 
+
 Frequently Asked Questions
 ==========================
 

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 08:36:12 UTC (rev 9334)
+++ trunk/blender_docs/manual/render/cycles/object_settings/object_data.rst	2022-06-02 08:37:16 UTC (rev 9335)
@@ -227,6 +227,8 @@
 
    - Bump and normal maps are ignored when calculating caustics.
 
+   - The Metal GPU rendering backend is not supported.
+
 .. _bpy.types.CyclesObjectSettings.is_caustics_caster:
 
 Cast Shadow Caustics