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

[Antonio Vazquez]

Commit: 122c375d6ee0df9c856da1a24aeb26ce6e310c02
Author: Antonio Vazquez
Date:   Sat Jul 14 09:42:03 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB122c375d6ee0df9c856da1a24aeb26ce6e310c02

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/object/object_modifier.c

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



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