[Bf-blender-cvs] [22a82cad06c] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: 22a82cad06c458ffca02cb7565b91bf6ce34584e
Author: Antonio Vazquez
Date:   Sat Feb 15 10:17:06 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB22a82cad06c458ffca02cb7565b91bf6ce34584e

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.h
	source/blender/draw/engines/overlay/overlay_extra.c

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



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