diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-29 16:46:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-29 16:46:26 +0400 |
| commit | 3dcc68e52949a1db122673c13545705a319e8902 (patch) | |
| tree | 1b47f798c6dc56d032e00e1b1ab0da906733833f /source/blender/blenloader | |
| parent | 7f7f3f502578d1d58719b0df722998bb52d5e078 (diff) | |
own changes in recent commit broke curve loading because the curve type checking function looked in the curves listbase.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 15b35d9b35d..6dfe6736528 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2735,7 +2735,7 @@ static void direct_link_curve(FileData *fd, Curve *cu) cu->strinfo= newdataadr(fd, cu->strinfo); cu->tb= newdataadr(fd, cu->tb); - if(curve_type(cu) != OB_FONT) link_list(fd, &(cu->nurb)); + if(cu->vfont == NULL) link_list(fd, &(cu->nurb)); else { cu->nurb.first=cu->nurb.last= 0; @@ -2766,7 +2766,7 @@ static void direct_link_curve(FileData *fd, Curve *cu) nu->bp= newdataadr(fd, nu->bp); nu->knotsu= newdataadr(fd, nu->knotsu); nu->knotsv= newdataadr(fd, nu->knotsv); - if (curve_type(cu) != OB_FONT) nu->charidx= nu->mat_nr; + if (cu->vfont == NULL) nu->charidx= nu->mat_nr; if(fd->flags & FD_FLAGS_SWITCH_ENDIAN) { switch_endian_knots(nu); |