[Bf-blender-cvs] [d7a92bc5592] soc-2021-curves: Merge branch 'master' into soc-2021-curves

[dilithjay]

Commit: d7a92bc55929a1152f0d5704e346b7439c6b3946
Author: dilithjay
Date:   Sun Oct 31 07:51:56 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBd7a92bc55929a1152f0d5704e346b7439c6b3946

Merge branch 'master' into soc-2021-curves

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



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

diff --cc tests/performance/benchmark
index a58c339e9f8,80556674dcc..80556674dcc
mode 100644,100755..100644
--- a/tests/performance/benchmark
+++ b/tests/performance/benchmark