diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 17:19:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-05 17:19:43 +0300 |
commit | 3eaf77fdd34bd9517b650cabde3574361bdc8d21 (patch) | |
tree | 5565b616ce36e6716c6f9ebe78ecb42bda078da1 /source/blender/blenloader/intern | |
parent | 1c1dc394662965356eee2347d824026cd9d18756 (diff) | |
parent | ad1ea9a427e3543a43ca2589f87f0c94b9be03ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 4c212ecca01..0b61aa5557a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3865,15 +3865,11 @@ static void lib_link_text(FileData *fd, Main *main) static void direct_link_text(FileData *fd, Text *text) { TextLine *ln; - + text->name = newdataadr(fd, text->name); - - text->undo_pos = -1; - text->undo_len = TXT_INIT_UNDO; - text->undo_buf = MEM_mallocN(text->undo_len, "undo buf"); - + text->compiled = NULL; - + #if 0 if (text->flags & TXT_ISEXT) { BKE_text_reload(text); |