diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-22 02:57:25 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-08-22 02:57:25 +0400 |
| commit | f4ae23f3794605f5b7c0a5b90d982d6dfd20d492 (patch) | |
| tree | 0f1c725f89be062437f0114d5ef1a2fe501fd600 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | a06321d55c2f25440120ac2fdead20639863a608 (diff) | |
svn merge -r 16174:16215 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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 9ce04c1c272..0f820e88541 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -392,7 +392,8 @@ typedef struct CollisionModifierData { unsigned int numverts; unsigned int numfaces; - int pad; + short absorption; /* used for forces, in % */ + short pad; float time; /* cfra time of modifier */ struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */ } CollisionModifierData; |