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

[YimingWu]

Commit: 3f7ed2261e48674c6f8d9b16d97c07ab36677bd9
Author: YimingWu
Date:   Fri Jul 5 07:37:58 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB3f7ed2261e48674c6f8d9b16d97c07ab36677bd9

Merge branch 'master' into soc-2019-npr

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



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