[Bf-blender-cvs] [8c80cb8522a] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 8c80cb8522ab101a33ab271ad0a2938d8b43d65f
Author: Antonio Vazquez
Date:   Wed Feb 12 19:00:28 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB8c80cb8522ab101a33ab271ad0a2938d8b43d65f

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_draw_utils.c
	source/blender/draw/engines/gpencil/gpencil_engine.c
	source/blender/draw/engines/gpencil/shaders/gpencil_edit_point_vert.glsl
	source/blender/draw/engines/gpencil/shaders/gpencil_zdepth_mix_frag.glsl

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



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