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)
1  2 
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/image.c