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

[Nick Wu]

Commit: 3a4515add9182a7fee420f5d1d8746ab03f89b3a
Author: Nick Wu
Date:   Wed Jun 27 11:12:43 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB3a4515add9182a7fee420f5d1d8746ab03f89b3a

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

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



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