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

[Antonioya]

Commit: 205bfe524d10117b79a4de56c607946a157b4ed3
Author: Antonioya
Date:   Fri Dec 7 19:24:31 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB205bfe524d10117b79a4de56c607946a157b4ed3

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/depsgraph/intern/depsgraph_tag.cc
	source/blender/editors/gpencil/gpencil_primitive.c
	source/blender/makesdna/DNA_ID.h
	source/blender/modifiers/intern/MOD_meshdeform.c
	source/blender/modifiers/intern/MOD_surfacedeform.c

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



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