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

[YimingWu]

Commit: 54804117e89931a1e7bfa67b2aaf4fe237881ab6
Author: YimingWu
Date:   Thu May 16 09:48:45 2019 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB54804117e89931a1e7bfa67b2aaf4fe237881ab6

Merge branch 'master' into soc-2018-npr

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



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