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

[Nick Wu]

Commit: fe815dc4da961941de1261af3d35329432f9af35
Author: Nick Wu
Date:   Fri May 25 14:35:02 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBfe815dc4da961941de1261af3d35329432f9af35

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

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



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