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

[Antonio Vazquez]

Commit: 9dc5670d0805cae1a9f08bbbdef625e50d4a7b54
Author: Antonio Vazquez
Date:   Mon Sep 21 20:09:18 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9dc5670d0805cae1a9f08bbbdef625e50d4a7b54

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/intern/gpencil.c
	source/blender/editors/gpencil/gpencil_trace_ops.c
	source/blender/editors/gpencil/gpencil_trace_utils.c

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



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