Commit: bb9422ec82acefee184a37e99dfc655d2aba594b
Author: Antonioya
Date: Wed Feb 27 16:32:47 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbb9422ec82acefee184a37e99dfc655d2aba594b
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/editors/gpencil/gpencil_edit.c
source/blender/makesdna/DNA_brush_types.h
source/blender/makesrna/intern/rna_brush.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
