[Bf-blender-cvs] [cc2aeba3e35] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: cc2aeba3e35a2df83f73a05d1df77f4fa9185c3c
Author: Sergey Sharybin
Date:   Wed Aug 4 17:41:46 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBcc2aeba3e35a2df83f73a05d1df77f4fa9185c3c

Merge branch 'master' into cycles-x

Temporarily disabling per-object fast GI AO distance as it needs to
be implemented a bit different in the Cycles X.

===================================================================



===================================================================