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

[Nick Wu]

Commit: 8d647a8f7d6b3f2b6650c1c8de2e42dfbc835b0b
Author: Nick Wu
Date:   Mon Jun 4 23:43:47 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB8d647a8f7d6b3f2b6650c1c8de2e42dfbc835b0b

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

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



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