diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-30 15:49:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-30 15:49:07 +0400 |
| commit | 052cb2afd22b9f54fdb1528066e6e3cba6db6e99 (patch) | |
| tree | 6e499a7e0ec79fab64dd0467aa2380355f6e9556 /source/blender/makesdna | |
| parent | 19fb497d139991ec759f3be3db53a27492c62877 (diff) | |
Rest shape key for cloth option, this makes it possible
to specify different spring lengths.
Implementation is quite ugly because the shape key has to be pulled
through the modifier stack somehow, need a more flexible data mask
system to solve this properly.
(commits 27773,27775,27778 by Brecht from render25 branch)
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index bd323c5821b..9b9f0ede526 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -76,8 +76,10 @@ typedef struct ClothSimSettings short vgroup_bend; /* vertex group for scaling bending stiffness */ short vgroup_mass; /* optional vertexgroup name for assigning weight.*/ short vgroup_struct; /* vertex group for scaling structural stiffness */ + short shapekey_rest; /* vertex group for scaling structural stiffness */ short presets; /* used for presets on GUI */ - short reset; + short reset; + short pad[3]; struct EffectorWeights *effector_weights; } ClothSimSettings; diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 223147594f5..dc07b0f368a 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -83,7 +83,8 @@ typedef struct CustomData { #define CD_WEIGHT_MCOL 20 /* for displaying weightpaint colors */ #define CD_ID_MCOL 21 #define CD_TEXTURE_MCOL 22 -#define CD_NUMTYPES 23 +#define CD_CLOTH_ORCO 23 +#define CD_NUMTYPES 24 /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) @@ -107,6 +108,7 @@ typedef struct CustomData { #define CD_MASK_TANGENT (1 << CD_TANGENT) #define CD_MASK_MDISPS (1 << CD_MDISPS) #define CD_MASK_WEIGHT_MCOL (1 << CD_WEIGHT_MCOL) +#define CD_MASK_CLOTH_ORCO (1 << CD_CLOTH_ORCO) /* derivedmesh wants CustomDataMask for weightpaint too, is not customdata though */ #define CD_MASK_WEIGHTPAINT (1 << CD_WEIGHTPAINT) |