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

[Nick Wu]

Commit: d234d872951d6572aed1f2a885d23e8dd16dac96
Author: Nick Wu
Date:   Fri Jun 22 13:31:25 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBd234d872951d6572aed1f2a885d23e8dd16dac96

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

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



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