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

[Nick Wu]

Commit: 2a7b4a84aff29ff31cdf2a03b5436784ca434365
Author: Nick Wu
Date:   Tue Jun 19 11:32:44 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB2a7b4a84aff29ff31cdf2a03b5436784ca434365

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

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



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