[Bf-blender-cvs] [b00154d2f98] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: b00154d2f98caef309155fa875abb00e6c0e946d
Author: Antonio Vazquez
Date:   Wed Nov 4 16:15:17 2020 +0100
Branches: greasepencil-edit-curve
https://developer.blender.org/rBb00154d2f98caef309155fa875abb00e6c0e946d

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/editors/gpencil/gpencil_edit.c

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



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