[Bf-blender-cvs] [efcc83a07d7] soc-2018-npr: Merge branch 'master' into soc-2018-npr

[Yiming Wu]

Commit: efcc83a07d737c84defb57a11c1549abba92f58d
Author: Yiming Wu
Date:   Mon Apr 22 09:46:20 2019 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBefcc83a07d737c84defb57a11c1549abba92f58d

Merge branch 'master' into soc-2018-npr

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



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