Merge branch 'greasepencil-object' into greasepencil-experimental greasepencil-experimental
authorAntonioya <blendergit@gmail.com>
Thu, 9 May 2019 11:41:39 +0000 (13:41 +0200)
committerAntonioya <blendergit@gmail.com>
Thu, 9 May 2019 11:41:39 +0000 (13:41 +0200)
 Conflicts:
source/blender/makesdna/DNA_object_types.h


Trivial merge