diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-05-11 00:33:09 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-05-11 00:33:09 +0400 |
commit | f751d0f6ae7de155343e24e36965956bd7a061e3 (patch) | |
tree | d963bb17c3fb79066e9de499b20317626d60fe92 /source/blender/blenkernel/BKE_subsurf.h | |
parent | 2ca64189b734dbd289d1a07e1ce9d332eadebe19 (diff) |
Replace hardcoded DMGridData structure with CCGElem/CCGKey.
* Changes to DerivedMesh interface: DMGridData has been removed,
getGridData() now returns an array of CCGElem pointers. Also added
getGridKey() to initialize a CCGKey (implemented only by
CCGDerivedMesh.)
* PBVH: added BLI_pbvh_get_grid_key().
* A lot of code is affected, but mainly is just replacing
DMGridData.co, DMGridData.no, and sizeof(DMGridData) with the
CCG_*_elem functions, removing the reliance on grid elements of
exactly six floats.
Diffstat (limited to 'source/blender/blenkernel/BKE_subsurf.h')
-rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 400056c527c..c4d23a327d7 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -34,9 +34,9 @@ /* struct DerivedMesh is used directly */ #include "BKE_DerivedMesh.h" +struct CCGElem; struct DMFlagMat; struct DMGridAdjacency; -struct DMGridData; struct DerivedMesh; struct MeshElemMap; struct Mesh; @@ -51,7 +51,6 @@ struct CCGSubsurf; struct CCGVert; struct EdgeHash; struct PBVH; -struct DMGridData; struct DMGridAdjacency; /**************************** External *****************************/ @@ -115,7 +114,7 @@ typedef struct CCGDerivedMesh { struct MeshElemMap *pmap; int *pmap_mem; - struct DMGridData **gridData; + struct CCGElem **gridData; struct DMGridAdjacency *gridAdjacency; int *gridOffset; struct CCGFace **gridFaces; |