Revision: 49545
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49545
Author:   campbellbarton
Date:     2012-08-03 23:44:50 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
code cleanup: use camelcase for struct name.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_font.h
    trunk/blender/source/blender/blenkernel/intern/anim.c
    trunk/blender/source/blender/blenkernel/intern/font.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c

Modified: trunk/blender/source/blender/blenkernel/BKE_font.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_font.h  2012-08-03 23:44:19 UTC 
(rev 49544)
+++ trunk/blender/source/blender/blenkernel/BKE_font.h  2012-08-03 23:44:50 UTC 
(rev 49545)
@@ -46,7 +46,7 @@
 struct CharInfo;
 struct Main;
 
-struct chartrans {
+struct CharTrans {
        float xof, yof;
        float rot;
        short linenr, charnr;
@@ -83,7 +83,7 @@
 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);
 

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c       2012-08-03 
23:44:19 UTC (rev 49544)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c       2012-08-03 
23:44:50 UTC (rev 49545)
@@ -1549,7 +1549,7 @@
 {
        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;
        

Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c       2012-08-03 
23:44:19 UTC (rev 49544)
+++ trunk/blender/source/blender/blenkernel/intern/font.c       2012-08-03 
23:44:50 UTC (rev 49545)
@@ -559,7 +559,7 @@
        }
 }
 
-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 @@
        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 @@
 
        /* 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) */
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c       2012-08-03 
23:44:19 UTC (rev 49544)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c       2012-08-03 
23:44:50 UTC (rev 49545)
@@ -76,6 +76,7 @@
 
 #ifdef RNA_RUNTIME
 
+#include "BKE_font.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_animsys.h"

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to