Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Apr 2018 14:19:43 +0000 (16:19 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Apr 2018 14:19:43 +0000 (16:19 +0200)
commit3eaf77fdd34bd9517b650cabde3574361bdc8d21
tree5565b616ce36e6716c6f9ebe78ecb42bda078da1
parent1c1dc394662965356eee2347d824026cd9d18756
parentad1ea9a427e3543a43ca2589f87f0c94b9be03ca
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/text.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/space_text/text_ops.c
source/creator/creator_args.c