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

[Nick Wu]

Commit: 3f7d07ac971088efc5ce51c586f1940e6d12ded5
Author: Nick Wu
Date:   Tue Jul 24 10:12:03 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB3f7d07ac971088efc5ce51c586f1940e6d12ded5

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

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



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