[Bf-blender-cvs] [b4f39f5ee9a] soc-2019-npr: Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

[YimingWu]

Commit: b4f39f5ee9a9712a91d8c6b58b5da2e21615e2ad
Author: YimingWu
Date:   Wed Jul 10 09:31:56 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBb4f39f5ee9a9712a91d8c6b58b5da2e21615e2ad

Merge remote-tracking branch 'origin/greasepencil-object' into soc-2019-npr

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



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