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)
1  2 
source/blender/blenkernel/intern/image.c
source/blender/editors/space_text/text_draw.c