[Bf-docboard-svn] bf-manual: [7922] trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst: Merge branch 'blender-2.92-release'

[Aaron Carlisle]

Revision: 7922
          https://developer.blender.org/rBM7922
Author:   Blendify
Date:     2021-04-05 19:03:54 +0200 (Mon, 05 Apr 2021)
Log Message:
-----------
Merge branch 'blender-2.92-release'

Modified Paths:
--------------
    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	2021-04-05 17:01:46 UTC (rev 7921)
+++ trunk/blender_docs	2021-04-05 17:03:54 UTC (rev 7922)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/branches/blender-2.92-release/blender_docs:7610-7884
\ No newline at end of property
+/branches/blender-2.92-release/blender_docs:7610-7921
\ No newline at end of property
Modified: trunk/blender_docs/manual/render/shader_nodes/input/ao.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/ao.rst	2021-04-05 17:01:46 UTC (rev 7921)
+++ trunk/blender_docs/manual/render/shader_nodes/input/ao.rst	2021-04-05 17:03:54 UTC (rev 7922)
@@ -15,9 +15,7 @@
 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.
 
-.. note:: This node is unsupported on :ref:`OptiX <render-cycles-gpu-optix>` GPU rendering.
 
-
 Inputs
 ======
 

Modified: trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst
===================================================================
--- trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst	2021-04-05 17:01:46 UTC (rev 7921)
+++ trunk/blender_docs/manual/render/shader_nodes/input/bevel.rst	2021-04-05 17:03:54 UTC (rev 7922)
@@ -21,9 +21,7 @@
 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:: This node is unsupported on :ref:`OptiX <render-cycles-gpu-optix>` GPU rendering.
 
-
 Inputs
 ======