[Bf-blender-cvs] [9b632addd34] soc-2018-hair-shader: Merge branch 'master' into soc-2018-hair-shader

[L. E. Segovia]

Commit: 9b632addd34758035331399e69b3f619bc6d4b16
Author: L. E. Segovia
Date:   Fri Jun 15 14:54:09 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB9b632addd34758035331399e69b3f619bc6d4b16

Merge branch 'master' into soc-2018-hair-shader

Week 5 final merge: update submodules

(I'm doing this extra merge to pull some CUDA fixes.)

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



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

diff --cc release/scripts/addons
index 4cb31f53101,9ae033c49c1..3959f1016e8
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4cb31f53101bf29b9eefd7e0eb6f4f99c20a74a1
 -Subproject commit 9ae033c49c1b16718eac6306bdc271a5e6e6bf38
++Subproject commit 3959f1016e86478456948c1c436064a9a16d6118