[Bf-blender-cvs] [0c4be6546cf] greasepencil-object: Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

[Antonioya]

Commit: 0c4be6546cf3ff16cabd59381c115ba6fc4e5377
Author: Antonioya
Date:   Tue Dec 11 18:08:06 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB0c4be6546cf3ff16cabd59381c115ba6fc4e5377

Merge branch 'greasepencil-object' of git.blender.org:blender into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_primitive.c

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



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