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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-10-24 17:05:09 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-10-24 17:05:09 +0400
commit3b2515ba0e71aeefb7ba43d7cede9fb05259b7f6 (patch)
treef50dd3c9c81675a8e354097f09b151b2a3cd4e1e /source/blender/blenkernel/intern/packedFile.c
parent86e433728d8e45716537e1a6ac0719383bd10aa0 (diff)
parenta301d2c898ed353aa6902a4893574ab24b7a2b4e (diff)
Merged changes in the trunk up to revision 32684.
Diffstat (limited to 'source/blender/blenkernel/intern/packedFile.c')
-rw-r--r--source/blender/blenkernel/intern/packedFile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index 33f1949c5ac..e8223caed41 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -227,7 +227,7 @@ void packAll(Main *bmain, ReportList *reports)
}
for(vf=bmain->vfont.first; vf; vf=vf->id.next)
- if(vf->packedfile == NULL && vf->id.lib==NULL && strcmp(vf->name, "<builtin>") != 0)
+ if(vf->packedfile == NULL && vf->id.lib==NULL && strcmp(vf->name, FO_BUILTIN_NAME) != 0)
vf->packedfile = newPackedFile(reports, vf->name);
for(sound=bmain->sound.first; sound; sound=sound->id.next)