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

[YimingWu]

Commit: c6896fa78078df799360f05f7e9f97108f369a66
Author: YimingWu
Date:   Thu Jul 11 07:56:04 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc6896fa78078df799360f05f7e9f97108f369a66

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

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



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