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

[Nick Wu]

Commit: 07a132f695dcf926378c8a4b3b567f469278247c
Author: Nick Wu
Date:   Mon May 28 21:49:20 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB07a132f695dcf926378c8a4b3b567f469278247c

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

f32a7.

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



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