[Bf-blender-cvs] [9e38c896848] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonioya]

Commit: 9e38c896848b381c0d8275e4ee42e28f7926ea0d
Author: Antonioya
Date:   Mon Nov 19 16:30:04 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB9e38c896848b381c0d8275e4ee42e28f7926ea0d

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_draw_utils.c

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



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