[Bf-blender-cvs] [3c60ab15095] temp-gpu-compute-shader-hair: Merge branch 'temp-gpu-compute-shaders' into temp-gpu-compute-shader-hair

[Jeroen Bakker]

Commit: 3c60ab15095d7140ab05263909da99df40c639f4
Author: Jeroen Bakker
Date:   Mon May 10 15:39:49 2021 +0200
Branches: temp-gpu-compute-shader-hair
https://developer.blender.org/rB3c60ab15095d7140ab05263909da99df40c639f4

Merge branch 'temp-gpu-compute-shaders' into temp-gpu-compute-shader-hair

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



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

diff --cc release/datafiles/locale
index 2c9eee69e65,2cef4877edc..5ab29b1331d
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2c9eee69e654a8b654ea08e356391c192dcc56df
 -Subproject commit 2cef4877edc40875978c4e95322bb5193f5815bf
++Subproject commit 5ab29b1331d2103dae634b987f121c4599459d7f
diff --cc release/scripts/addons
index eb3952fcd26,bcd08a9506d..7324beddde4
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit eb3952fcd26e9897bcc0128eab925b070c0e7593
 -Subproject commit bcd08a9506d33bdd7358201031b04d041ef22d94
++Subproject commit 7324beddde4695ce952188f9cdb6e21a9631eeed