Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 09:08:02 +0000 (11:08 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 31 May 2018 09:08:02 +0000 (11:08 +0200)
1  2 
source/blender/editors/space_image/image_ops.c
source/blender/editors/util/ed_util.c
source/blender/makesrna/intern/rna_image_api.c

Simple merge