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

[dilithjay]

Commit: 02ea6e6a4bab71e5802d09b08f2a0afa4fcb8664
Author: dilithjay
Date:   Thu Jul 29 14:58:55 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rB02ea6e6a4bab71e5802d09b08f2a0afa4fcb8664

Merge branch 'master' into soc-2021-curves

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



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

diff --cc tests/performance/benchmark
index eb01b6053a7,ad1e07d0ef3..ad1e07d0ef3
mode 100644,100755..100644
--- a/tests/performance/benchmark
+++ b/tests/performance/benchmark