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)
commitdc08df659eaadd6c59c89f268aad9cd103e1e7e5
treea9c9b9b05a0d38330f4d675175583d9ef96594b3
parente15591a1d79b439fe539e627bb7331da093214cc
parent5389964eea27c4d0129171ee69129210ee522bc3
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/icons.c
source/blender/makesrna/intern/rna_brush.c