Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 16 Mar 2018 16:50:07 +0000 (17:50 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 16 Mar 2018 16:50:07 +0000 (17:50 +0100)
1  2 
source/blender/blenkernel/intern/icons.c
source/blender/makesrna/intern/rna_brush.c