diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
commit | 31d2ee9bf77bb991ea4779c47379b2cee84b27ed (patch) | |
tree | fd6f021356fc78d6dfeff9f18f601ce645dd7ffe /source/blender/blenkernel/intern/font.c | |
parent | 7b7214c72233f72268f72d31fd8626a0f94e557e (diff) |
style cleanup, brackets in else/if, some indentation.
Diffstat (limited to 'source/blender/blenkernel/intern/font.c')
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ba23b2123d6..4cf47906b64 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -165,8 +165,7 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont) pf= vfont->packedfile; // We need to copy a tmp font to memory unless it is already there - if(!tmpfnt) - { + if(!tmpfnt) { tpf= MEM_callocN(sizeof(*tpf), "PackedFile"); tpf->data= MEM_mallocN(pf->size, "packFile"); tpf->size= pf->size; @@ -178,11 +177,11 @@ static VFontData *vfont_get_data(Main *bmain, VFont *vfont) tmpfnt->vfont= vfont; BLI_addtail(&ttfdata, tmpfnt); } - } else { + } + else { pf= newPackedFile(NULL, vfont->name, ID_BLEND_PATH(bmain, &vfont->id)); - - if(!tmpfnt) - { + + if (!tmpfnt) { tpf= newPackedFile(NULL, vfont->name, ID_BLEND_PATH(bmain, &vfont->id)); // Add temporary packed file to globals @@ -257,8 +256,7 @@ VFont *load_vfont(Main *bmain, const char *name) } // Do not add FO_BUILTIN_NAME to temporary listbase - if(strcmp(filename, FO_BUILTIN_NAME)) - { + if (strcmp(filename, FO_BUILTIN_NAME)) { tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; |