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

[Nick Wu]

Commit: 68374d38381ba597504c1cba4b303d0b336e6c81
Author: Nick Wu
Date:   Thu Jul 26 10:09:40 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB68374d38381ba597504c1cba4b303d0b336e6c81

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

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



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