Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 11 May 2018 08:49:58 +0000 (10:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 11 May 2018 08:49:58 +0000 (10:49 +0200)
commitd19c8605f886681fa5260ac6611d28bee8fd3a33
treed8ac53a3e4420eae9a158a33b59c872f68647a3d
parentbcb245bd7137a8c3df061ed349c41c2247c6ef0f
parent13beeb58922747cc1a28bac58ceb1b44820808cd
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/image.c