Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Apr 2018 06:18:42 +0000 (08:18 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Apr 2018 06:18:42 +0000 (08:18 +0200)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_text/text_ops.c
source/blender/gpu/intern/gpu_buffers.c