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

[Nick Wu]

Commit: 74ca16c418c54e9290e4c0e1c968de203c78149f
Author: Nick Wu
Date:   Thu Jun 14 09:50:06 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB74ca16c418c54e9290e4c0e1c968de203c78149f

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

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



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