Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 6 Sep 2018 18:11:18 +0000 (20:11 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 6 Sep 2018 18:11:18 +0000 (20:11 +0200)
commit3733c52985878b8d3ae5911f415ab9328966d48f
tree4e4c665f808dd106bf54c2fa006ec00ba067f532
parent90ea5c543aa7e091ae21aac6b8d87c97c3aa0464
parenta5bb40170417acede168291eb81e3076a6cee077
Merge branch 'master' into blender2.8
source/blender/editors/space_image/image_ops.c