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)
commit9a301978bdf0a7bab8dedf62e8c623aa33e96177
tree12582e40131e113efc6a21040c084144e04d002d
parent1f5d51e44ecf99f34d8e733559a9312e5ae3ef33
parentfcac9e841040812f227ecc3f10d4a970b9e174fd
Merge branch 'master' into blender2.8
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_text/text_ops.c
source/blender/gpu/intern/gpu_buffers.c