Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 19:01:48 +0000 (17:01 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 19 Jan 2018 19:01:48 +0000 (17:01 -0200)
commit4d0bb7de64bd4142e89a7410c3ea2686178048a3
tree27a1b7389e1ff31211656caf902b74a8bbb9d98e
parentefe1af3d11a930b539718cc566049f07316427ff
parent075def8fbda709e9db9086e9f2800a56103eb35d
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/blenkernel/intern/image.c
source/blender/editors/space_text/text_draw.c