diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-06-03 23:27:46 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-06-03 23:27:46 +0400 |
| commit | 7265e9e855e372061d50233e76d89f7113e2c636 (patch) | |
| tree | 77f3b9b550c8dc6c6444afead01d2324de5b8846 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | db650f1be9d73b9c4d2e200a91a87fd5b2bb24d8 (diff) | |
| parent | 0c0c43f62001eb652b8a8c374cca390824ef2c5e (diff) | |
Merge from trunk
svn merge -r 15064:15104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 40958f9c68f..7590cd0c3b9 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -391,7 +391,7 @@ typedef struct CollisionModifierData { unsigned int numfaces; int pad; float time; /* cfra time of modifier */ - struct BVH *bvh; /* bounding volume hierarchy for this cloth object */ + struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */ } CollisionModifierData; typedef enum { |