[Bf-blender-cvs] [c6f58fc5234] soc-2019-npr: Merge branch 'master' into soc-2019-npr

[YimingWu]

Commit: c6f58fc52349da561a7c9da2d78a7b15281d8b5c
Author: YimingWu
Date:   Wed Jun 26 12:44:13 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc6f58fc52349da561a7c9da2d78a7b15281d8b5c

Merge branch 'master' into soc-2019-npr

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



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