[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44450] trunk/blender/source/blender/ blenkernel: Style cleanup: remove underscore prefix from CCG struct names.

[Nicholas Bishop]

Revision: 44450
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44450
Author:   nicholasbishop
Date:     2012-02-26 06:50:54 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
Style cleanup: remove underscore prefix from CCG struct names.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_subsurf.h
    trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
    trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h

Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h       2012-02-26 
05:48:12 UTC (rev 44449)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h       2012-02-26 
06:50:54 UTC (rev 44450)
@@ -41,10 +41,10 @@
 struct Object;
 struct PBVH;
 struct SubsurfModifierData;
-struct _CCGEdge;
-struct _CCGFace;
-struct _CCGSubsurf;
-struct _CCGVert;
+struct CCGEdge;
+struct CCGFace;
+struct CCGSubsurf;
+struct CCGVert;
 struct EdgeHash;
 struct PBVH;
 struct DMGridData;
@@ -65,14 +65,14 @@
 typedef struct CCGDerivedMesh {
        DerivedMesh dm;
 
-       struct _CCGSubSurf *ss;
+       struct CCGSubSurf *ss;
        int freeSS;
        int drawInteriorEdges, useSubsurfUv;
 
-       struct {int startVert; struct _CCGVert *vert;} *vertMap;
-       struct {int startVert; int startEdge; struct _CCGEdge *edge;} *edgeMap;
+       struct {int startVert; struct CCGVert *vert;} *vertMap;
+       struct {int startVert; int startEdge; struct CCGEdge *edge;} *edgeMap;
        struct {int startVert; int startEdge;
-                       int startFace; struct _CCGFace *face;} *faceMap;
+                       int startFace; struct CCGFace *face;} *faceMap;
 
        short *edgeFlags;
        char *faceFlags;
@@ -89,7 +89,7 @@
        struct DMGridData **gridData;
        struct DMGridAdjacency *gridAdjacency;
        int *gridOffset;
-       struct _CCGFace **gridFaces;
+       struct CCGFace **gridFaces;
 
        struct {
                struct MultiresModifierData *mmd;

Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-02-26 
05:48:12 UTC (rev 44449)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2012-02-26 
06:50:54 UTC (rev 44450)
@@ -306,7 +306,7 @@
        Face_eEffected =    (1 << 0)
 } /*FaceFlags*/;
 
-struct _CCGVert {
+struct CCGVert {
        CCGVert         *next;  /* EHData.next */
        CCGVertHDL      vHDL;   /* EHData.key */
 
@@ -319,7 +319,7 @@
 };
 #define VERT_getLevelData(v)           ((byte *) &(v)[1])
 
-struct _CCGEdge {
+struct CCGEdge {
        CCGEdge         *next;  /* EHData.next */
        CCGEdgeHDL      eHDL;   /* EHData.key */
 
@@ -334,7 +334,7 @@
 };
 #define EDGE_getLevelData(e)           ((byte *) &(e)[1])
 
-struct _CCGFace {
+struct CCGFace {
        CCGFace         *next;  /* EHData.next */
        CCGFaceHDL      fHDL;   /* EHData.key */
 
@@ -358,7 +358,7 @@
        eSyncState_Partial
 } SyncState;
 
-struct _CCGSubSurf {
+struct CCGSubSurf {
        EHash *vMap;    /* map of CCGVertHDL -> Vert */
        EHash *eMap;    /* map of CCGEdgeHDL -> Edge */
        EHash *fMap;    /* map of CCGFaceHDL -> Face */

Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h 2012-02-26 
05:48:12 UTC (rev 44449)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.h 2012-02-26 
06:50:54 UTC (rev 44450)
@@ -8,28 +8,27 @@
 typedef void* CCGEdgeHDL;
 typedef void* CCGFaceHDL;
 
-typedef struct _CCGVert CCGVert;
-typedef struct _CCGEdge CCGEdge;
-typedef struct _CCGFace CCGFace;
+typedef struct CCGSubSurf CCGSubSurf;
+typedef struct CCGVert CCGVert;
+typedef struct CCGEdge CCGEdge;
+typedef struct CCGFace CCGFace;
 
-typedef struct _CCGMeshIFC CCGMeshIFC;
-struct _CCGMeshIFC {
+typedef struct CCGMeshIFC {
        int                     vertUserSize, edgeUserSize, faceUserSize;
 
        int                     vertDataSize;
-};
+} CCGMeshIFC;
 
 /***/
 
 typedef void* CCGAllocatorHDL;
 
-typedef struct _CCGAllocatorIFC CCGAllocatorIFC;
-struct _CCGAllocatorIFC {
+typedef struct CCGAllocatorIFC {
        void*           (*alloc)                        (CCGAllocatorHDL a, int 
numBytes);
        void*           (*realloc)                      (CCGAllocatorHDL a, 
void *ptr, int newSize, int oldSize);
        void            (*free)                         (CCGAllocatorHDL a, 
void *ptr);
        void            (*release)                      (CCGAllocatorHDL a);
-};
+} CCGAllocatorIFC;
 
 /***/
 
@@ -46,8 +45,6 @@
 
 /***/
 
-typedef struct _CCGSubSurf CCGSubSurf;
-
 CCGSubSurf*    ccgSubSurf_new  (CCGMeshIFC *ifc, int subdivisionLevels, 
CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator);
 void           ccgSubSurf_free (CCGSubSurf *ss);
 
@@ -141,9 +138,9 @@
 
 /***/
 
-typedef struct _CCGVertIterator CCGVertIterator;
-typedef struct _CCGEdgeIterator CCGEdgeIterator;
-typedef struct _CCGFaceIterator CCGFaceIterator;
+typedef struct CCGVertIterator CCGVertIterator;
+typedef struct CCGEdgeIterator CCGEdgeIterator;
+typedef struct CCGFaceIterator CCGFaceIterator;
 
 CCGVertIterator*       ccgSubSurf_getVertIterator      (CCGSubSurf *ss);
 CCGEdgeIterator*       ccgSubSurf_getEdgeIterator      (CCGSubSurf *ss);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs