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

[Nick Wu]

Commit: d9b0c6711ed65b5ba2c59ac1ddb9555067d69c0e
Author: Nick Wu
Date:   Tue Aug 7 19:57:07 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBd9b0c6711ed65b5ba2c59ac1ddb9555067d69c0e

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

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



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