diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-05 17:11:48 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-02-05 17:11:48 +0300 |
| commit | 7a70e5c0c0eacda814ffc32035a649a88b5326d0 (patch) | |
| tree | a0de6960cc50e901299bb754c294433ca4f526ad /source/blender/blenkernel/BKE_cloth.h | |
| parent | 790d4927bdbdacbdd89ffa28ebd99a8678dfac7e (diff) | |
Cloth: 1. Fix for deflection being enabled thourgh softbody interface, 2. Fix for wrong calculated friction, 3. Fix for some header which was accitently blown up by my editor
Diffstat (limited to 'source/blender/blenkernel/BKE_cloth.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_cloth.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 430a8fd50a6..bf0ecd21397 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -35,10 +35,13 @@ #define BKE_CLOTH_H #include "float.h" +#include "BLI_editVert.h" #include "BLI_linklist.h" + #include "BKE_collision.h" #include "BKE_customdata.h" #include "BKE_DerivedMesh.h" + #include "DNA_cloth_types.h" #include "DNA_customdata_types.h" #include "DNA_meshdata_types.h" @@ -101,6 +104,7 @@ typedef struct ClothSpring float dfdv[3][3]; float f[3]; float stiffness; /* stiffness factor from the vertex groups */ + float editrestlen; } ClothSpring; @@ -165,6 +169,7 @@ typedef enum /* Bits to or into the ClothVertex.flags. */ #define CLOTH_VERT_FLAG_PINNED 1 #define CLOTH_VERT_FLAG_COLLISION 2 +#define CLOTH_VERT_FLAG_PINNED_EM 3 typedef void ( *CM_COLLISION_RESPONSE ) ( ClothModifierData *clmd, CollisionModifierData *collmd, CollisionTree *tree1, CollisionTree *tree2 ); |