Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 7 Jul 2017 09:27:48 +0000 (11:27 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 7 Jul 2017 09:27:48 +0000 (11:27 +0200)
commit36153509572f27fee7b95eae8efaa96b35549d0b
tree7ed914b7a79b22c9fafcf54e2ff1431c2606421b
parentd2902660493d5be9cc7149c4be63fe348258e13c
parentfee7f688c32eee152742dcda031675d42975e52f
Merge remote-tracking branch 'origin/master' into blender2.8
release/scripts/startup/bl_operators/clip.py
source/blender/editors/space_image/image_ops.c