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)
1  2 
release/scripts/startup/bl_operators/clip.py
source/blender/editors/space_image/image_ops.c