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)
commit42fa889e46c2f63cf99482b603fbe8d2117ed2c7
treed5440b4cf2ea127e19acc047eb1832da1a4100de
parent117fd0247715bff6c265bb75f727112ce1fcb3cc
parent08274433e1bd9db5a2a27e5d2f8862e9cc3f27f0
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/image.c
source/blender/makesrna/intern/rna_image_api.c