diff options
| author | Alexander Ewering <blender@instinctive.de> | 2005-10-27 14:01:11 +0400 |
|---|---|---|
| committer | Alexander Ewering <blender@instinctive.de> | 2005-10-27 14:01:11 +0400 |
| commit | c75336540372795b6e203f068416f72bd3cce989 (patch) | |
| tree | b87968bb534b699b989e44e5e2dbce3210f767ff /source/blender/blenloader/intern/readfile.c | |
| parent | f59827f346d4289c5c70fc836a2c21be8a84362e (diff) | |
I hope this commit finally fixes loading of .blend files with text objects
that had been converted to curve with ALT-C.
Should fix bugs 2973 and 3269. Thanks Ken Hughes for a pointer into the
right direction.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 77d041d8be7..9fddd4212ea 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -1896,12 +1896,13 @@ static void direct_link_curve(FileData *fd, Curve *cu) cu->mat= newdataadr(fd, cu->mat); test_pointer_array(fd, (void **)&cu->mat); cu->str= newdataadr(fd, cu->str); + cu->strinfo= newdataadr(fd, cu->strinfo); + cu->tb= newdataadr(fd, cu->tb); if(cu->vfont==0) link_list(fd, &(cu->nurb)); else { cu->nurb.first=cu->nurb.last= 0; - cu->strinfo= newdataadr(fd, cu->strinfo); - cu->tb= newdataadr(fd, cu->tb); + tb= MEM_callocN(MAXTEXTBOX*sizeof(TextBox), "TextBoxread"); if (cu->tb) { memcpy(tb, cu->tb, cu->totbox*sizeof(TextBox)); |