Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-09-29 10:24:05 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-09-29 10:24:05 +0400
commit33fab0f7d7433e8d942c6eb448a14da05f1a22f2 (patch)
tree3d32596f4c58871f4a6189c02c4425e51c6adde6 /source/blender/blenloader
parent7a950c287692dc44edc23eb9daf865de8e115307 (diff)
fix for user counts with text3d bold/italic fonts.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index bccbc451427..15b35d9b35d 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(cu->vfont==0) link_list(fd, &(cu->nurb));
+ if(curve_type(cu) != OB_FONT) 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 (cu->vfont==0) nu->charidx= nu->mat_nr;
+ if (curve_type(cu) != OB_FONT) nu->charidx= nu->mat_nr;
if(fd->flags & FD_FLAGS_SWITCH_ENDIAN) {
switch_endian_knots(nu);