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

[Antonio Vazquez]

Commit: b50a7272f6d9216c35f02110131b55d5d16a8274
Author: Antonio Vazquez
Date:   Wed Dec 4 14:30:08 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb50a7272f6d9216c35f02110131b55d5d16a8274

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
	release/scripts/startup/bl_ui/space_dopesheet.py
	source/blender/blenloader/intern/versioning_defaults.c
	source/blender/editors/animation/anim_channels_defines.c

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



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