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

[Nick Wu]

Commit: 80ec390d077a0a205f8b1b1c522d3ae6e798804b
Author: Nick Wu
Date:   Thu May 24 15:11:43 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB80ec390d077a0a205f8b1b1c522d3ae6e798804b

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

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



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