diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 17:41:00 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:18:11 +0300 |
commit | d140e70c496122915eb5c05aba83153e2e0d7998 (patch) | |
tree | 1e589247d69da64aa7b0e7802319237ec050b5d6 /source/blender/blenkernel/BKE_subsurf.h | |
parent | 147bd16ed1bb3415b30408b0eab110d0854eadd2 (diff) | |
parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) |
Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments
Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.
Conflicts:
source/blender/blenlib/BLI_ghash.h
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenlib/intern/hash_mm2a.c
source/blender/bmesh/tools/bmesh_region_match.c
tests/gtests/blenlib/BLI_ghash_performance_test.cc
tests/gtests/blenlib/BLI_ghash_test.cc
tests/gtests/blenlib/CMakeLists.txt
Diffstat (limited to 'source/blender/blenkernel/BKE_subsurf.h')
-rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 3dae4087866..c1c96c8228c 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -41,17 +41,14 @@ struct DerivedMesh; struct MeshElemMap; struct Mesh; struct MPoly; -struct MultiresSubsurf; struct Object; struct PBVH; struct SubsurfModifierData; struct CCGEdge; struct CCGFace; -struct CCGSubsurf; struct CCGVert; struct EdgeHash; struct PBVH; -struct DMGridAdjacency; /**************************** External *****************************/ @@ -120,7 +117,6 @@ typedef struct CCGDerivedMesh { int *pmap_mem; struct CCGElem **gridData; - struct DMGridAdjacency *gridAdjacency; int *gridOffset; struct CCGFace **gridFaces; struct DMFlagMat *gridFlagMats; |