diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 03:44:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-04 03:44:50 +0400 |
| commit | 96bda09d230f20f9402c5b1b54e2d27eec550b12 (patch) | |
| tree | 20af5c9dddfc09bad9c13464415b3ad085861a46 | |
| parent | ee86f7fe159b5f90978b4931c4262a4aa95afab7 (diff) | |
code cleanup: use camelcase for struct name.
| -rw-r--r-- | source/blender/blenkernel/BKE_font.h | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/anim.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/font.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index 69e8a6f0653..938a13483d5 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -46,7 +46,7 @@ struct TmpFont; struct CharInfo; struct Main; -struct chartrans { +struct CharTrans { float xof, yof; float rot; short linenr, charnr; @@ -83,7 +83,7 @@ struct VFont *BKE_vfont_load(struct Main *bmain, const char *name); struct TmpFont *BKE_vfont_tmpfont_find(struct VFont *vfont); void BKE_vfont_tmpfont_remove(struct VFont *vfont); -struct chartrans *BKE_vfont_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode); +struct CharTrans *BKE_vfont_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode); int BKE_vfont_select_get(struct Object *ob, int *start, int *end); diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 43b2df7ff95..a52e37d5034 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1549,7 +1549,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int par_inde { Object *ob, *obar[256] = {NULL}; Curve *cu; - struct chartrans *ct, *chartransdata; + struct CharTrans *ct, *chartransdata; float vec[3], obmat[4][4], pmat[4][4], fsize, xof, yof; int slen, a; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 74a8751b26a..e977b9389a3 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -559,7 +559,7 @@ static float char_width(Curve *cu, VChar *che, CharInfo *info) } } -struct chartrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int mode) +struct CharTrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int mode) { VFont *vfont, *oldvfont; VFontData *vfd = NULL; @@ -567,7 +567,7 @@ struct chartrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int CharInfo *info = NULL, *custrinfo; TextBox *tb; VChar *che; - struct chartrans *chartransdata = NULL, *ct; + struct CharTrans *chartransdata = NULL, *ct; float *f, xof, yof, xtrax, linedist, *linedata, *linedata2, *linedata3, *linedata4; float twidth, maxlen = 0; int i, slen, j; @@ -622,7 +622,7 @@ struct chartrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int /* calc offset and rotation of each char */ ct = chartransdata = - (struct chartrans *)MEM_callocN((slen + 1) * sizeof(struct chartrans), "buildtext"); + (struct CharTrans *)MEM_callocN((slen + 1) * sizeof(struct CharTrans), "buildtext"); /* We assume the worst case: 1 character per line (is freed at end anyway) */ diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index 5151170defe..897e784c8e4 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -76,6 +76,7 @@ EnumPropertyItem id_type_items[] = { #ifdef RNA_RUNTIME +#include "BKE_font.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_animsys.h" |