diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
| commit | f026266e185f90543138a856898f50b2295a12fc (patch) | |
| tree | f674a1a1b328a423ec4bdcdc4a11f35e56669e7a /source/blender/blenkernel/BKE_DerivedMesh.h | |
| parent | b7fe3258b66698f62f630d0b18431b54b65101ed (diff) | |
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 8df30b1eaf5..42904014ea8 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -44,6 +44,7 @@ #include "DNA_customdata_types.h" #include "BKE_customdata.h" +#include "BKE_bvhutils.h" struct MVert; struct MEdge; @@ -71,6 +72,7 @@ struct DerivedMesh { int numVertData, numEdgeData, numFaceData; int needsFree; /* checked on ->release, is set to 0 for cached results */ int deformedOnly; /* set by modifier stack if only deformed from original */ + BVHCache bvhCache; /* Misc. Queries */ |