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

[YimingWu]

Commit: c216cb6a695d1444cb34b5672b49cec0503b632a
Author: YimingWu
Date:   Tue Jul 2 13:11:58 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc216cb6a695d1444cb34b5672b49cec0503b632a

Merge branch 'master' into soc-2019-npr

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



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