Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 11 Jul 2018 12:56:13 +0000 (14:56 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 11 Jul 2018 12:56:13 +0000 (14:56 +0200)
1  2 
source/blender/blenkernel/intern/image.c
source/blender/makesrna/intern/rna_image_api.c