Commit: 856ad07a71a959bf8115386bb75b4215e72dae20
Author: Antonioya
Date: Tue Feb 5 12:10:56 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB856ad07a71a959bf8115386bb75b4215e72dae20
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/makesrna/intern/rna_brush.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
