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

[Antonio Vazquez]

Commit: eb29a981260289373772676562c20ab0ab388473
Author: Antonio Vazquez
Date:   Fri Oct 30 15:48:04 2020 +0100
Branches: greasepencil-edit-curve
https://developer.blender.org/rBeb29a981260289373772676562c20ab0ab388473

Merge branch 'master' into greasepencil-edit-curve

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

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



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