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

[YimingWu]

Commit: 419837b6806f87adbc0bfc9420fdce5cef70f325
Author: YimingWu
Date:   Tue Jun 25 12:15:12 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB419837b6806f87adbc0bfc9420fdce5cef70f325

Merge branch 'master' into soc-2019-npr

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



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