diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-07-19 08:44:37 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-07-19 08:44:37 +0400 |
commit | c11c196efadf5ef52293d782638497f86a209722 (patch) | |
tree | 43abcd60b2400d28db8686f4dbea68f17475ef58 /source/blender/blenkernel/BKE_subsurf.h | |
parent | f54aa7811029c90b6071ccc9e27e57a758e5884d (diff) | |
parent | 7f083c45bee15f7540e2a35a725efe28fc962239 (diff) |
part 1 of merge from trunk at r30358; it compiles, but doesn't link quite yet :)
Diffstat (limited to 'source/blender/blenkernel/BKE_subsurf.h')
-rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index a7926e90e02..2e2b4f2bf2a 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -28,16 +28,21 @@ #ifndef BKE_SUBSURF_H #define BKE_SUBSURF_H -struct Mesh; -struct Object; +struct DMGridAdjacency; +struct DMGridData; struct DerivedMesh; struct EditMesh; +struct IndexNode; +struct ListBase; +struct Mesh; struct MultiresSubsurf; +struct Object; +struct PBVH; struct SubsurfModifierData; -struct _CCGSubsurf; -struct _CCGVert; struct _CCGEdge; struct _CCGFace; +struct _CCGSubsurf; +struct _CCGVert; struct EdgeHash; struct PBVH; struct DMGridData; @@ -46,12 +51,12 @@ struct DMGridAdjacency; /**************************** External *****************************/ struct DerivedMesh *subsurf_make_derived_from_derived( - struct DerivedMesh *dm, - struct SubsurfModifierData *smd, - int useRenderParams, float (*vertCos)[3], - int isFinalCalc, int editMode); + struct DerivedMesh *dm, + struct SubsurfModifierData *smd, + int useRenderParams, float (*vertCos)[3], + int isFinalCalc, int editMode); -void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]); +void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]); /**************************** Internal *****************************/ @@ -65,7 +70,7 @@ typedef struct CCGDerivedMesh { 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; @@ -73,6 +78,9 @@ typedef struct CCGDerivedMesh { int *reverseFaceMap; struct PBVH *pbvh; + int pbvh_draw; + struct ListBase *fmap; + struct IndexNode *fmap_mem; struct DMGridData **gridData; struct DMGridAdjacency *gridAdjacency; @@ -86,7 +94,7 @@ typedef struct CCGDerivedMesh { int lvl, totlvl; float (*orco)[3]; - Object *ob; + struct Object *ob; int modified; void (*update)(DerivedMesh*); |