kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: use camelcase for struct name.

Browse Source
This commit is contained in:
Campbell Barton 2012-08-03 23:44:50 +00:00
parent ee86f7fe15
commit 96bda09d23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_font.h
View File

@ -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);

2
source/blender/blenkernel/intern/anim.c
View File

@ -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;

6
source/blender/blenkernel/intern/font.c
View File

@ -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) */

1
source/blender/makesrna/intern/rna_ID.c
View File

@ -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"