[Bf-blender-cvs] [cde785e9860] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: cde785e9860575aa4fa7f8ed50ad66c6d28fabd1
Author: Nick Wu
Date:   Thu May 24 15:38:04 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBcde785e9860575aa4fa7f8ed50ad66c6d28fabd1

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

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



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