Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Nov 2018 00:58:57 +0000 (11:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Nov 2018 00:59:41 +0000 (11:59 +1100)
commit101fd08348e5717f98af93481e6cc97d3bf920c3
tree32a8130570ed435290656f48c7af8bfde7e96532
parent4e9911663a22766f6751d33ae84c1ebcc1fae559
parent59e70d5f8d68d8fa9eb34f75866578fafece8709
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/paint.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_curve.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/makesrna/intern/rna_brush.c