diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-17 16:21:06 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:01 +0300 |
| commit | bbae8f88b8f305a8ed85cab718d2a66b476da3c1 (patch) | |
| tree | d1f4950ca2845f098a5d452db31ce390a3ed7dc0 /source/blender/makesdna/DNA_cloth_types.h | |
| parent | be016daf15de7c1581a096b17c1380a35d742aa0 (diff) | |
Made the voxel grid size for hair interaction configurable and increased
the default to 32.
Conflicts:
source/blender/blenloader/intern/versioning_270.c
Diffstat (limited to 'source/blender/makesdna/DNA_cloth_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_cloth_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 4d862e48109..c7eee96bd06 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -75,6 +75,7 @@ typedef struct ClothSimSettings { float vel_damping; /* damp the velocity to speed up getting to the resting position */ float shrink_min; /* min amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ float shrink_max; /* max amount to shrink cloth by 0.0f (no shrink) - 1.0f (shrink to nothing) */ + int voxel_res; /* resolution of voxel grid for interaction */ int stepsPerFrame; /* Number of time steps per frame. */ int flags; /* flags, see CSIMSETT_FLAGS enum above. */ @@ -88,7 +89,6 @@ typedef struct ClothSimSettings { short shapekey_rest; /* vertex group for scaling structural stiffness */ short presets; /* used for presets on GUI */ short reset; - char pad[4]; struct EffectorWeights *effector_weights; } ClothSimSettings; |