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)
commit17f458ff320c5c0a0c5cdaeb5da60926d3e03d68
treea67031752a7f2011e5cd4ee6b761eb0ad1a274e8
parentfcfe1963a622fed257b8b9597424bf11edb19c52
parent24d1829243c6e41c639c1d0722a13599a7c1927c
Merge branch 'master' into blender2.8
source/blender/editors/space_image/image_ops.c
source/blender/editors/util/ed_util.c
source/blender/makesrna/intern/rna_image_api.c