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)
1  2 
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

Simple merge