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

[L. E. Segovia]

Commit: cbe66360dd4a7ad8648b14b12e4a377555b932d2
Author: L. E. Segovia
Date:   Sat Jun 23 00:32:19 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rBcbe66360dd4a7ad8648b14b12e4a377555b932d2

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

Week 6 merge

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



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

diff --cc intern/cycles/kernel/closure/bsdf.h
index f359d44fead,c1b02cd4be1..dd17b45ab50
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@@ -214,13 -210,13 +214,13 @@@ ccl_device_inline int bsdf_sample(Kerne
  #ifndef __KERNEL_CUDA__
  ccl_device
  #else
- ccl_device_forceinline
+ ccl_device_inline
  #endif
  float3 bsdf_eval(KernelGlobals *kg,
 -                 ShaderData *sd,
 -                 const ShaderClosure *sc,
 -                 const float3 omega_in,
 -                 float *pdf)
 +				 ShaderData *sd,
 +				 const ShaderClosure *sc,
 +				 const float3 omega_in,
 +				 float *pdf)
  {
  	float3 eval;
  
diff --cc release/scripts/addons
index 3959f1016e8,9ae033c49c1..e578b0f187e
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3959f1016e86478456948c1c436064a9a16d6118
 -Subproject commit 9ae033c49c1b16718eac6306bdc271a5e6e6bf38
++Subproject commit e578b0f187ecd498e960d689dd5ca8ee1bbc854c
diff --cc source/tools
index ca3e38d8966,87f7038ee8c..76fcedc766b
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit ca3e38d89666c422d6681bb06967a59ef1a4a7df
 -Subproject commit 87f7038ee8c4b46a5e73a1a9065e2a9b7367f594
++Subproject commit 76fcedc766b533073a18a00e45b70ec36303a39f