[Bf-blender-cvs] [82bd3e08e11] greasepencil-experimental: Merge branch 'greasepencil-object' into greasepencil-experimental

[Charlie Jolly]

Commit: 82bd3e08e11a0356b073fc34ec248825db5079ce
Author: Charlie Jolly
Date:   Wed Jan 23 13:56:31 2019 +0000
Branches: greasepencil-experimental
https://developer.blender.org/rB82bd3e08e11a0356b073fc34ec248825db5079ce

Merge branch 'greasepencil-object' into greasepencil-experimental

# Conflicts:
#	source/blender/editors/gpencil/gpencil_fill.c

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



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