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

[Sergey Sharybin]

Commit: fb96482b2f57a7d51046c5e6c77b7f9e488dcf25
Author: Sergey Sharybin
Date:   Tue Jun 15 11:36:52 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBfb96482b2f57a7d51046c5e6c77b7f9e488dcf25

Merge branch 'master' into cycles-x

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



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