diff options
author | Julian Eisel <julian@blender.org> | 2020-06-13 23:54:07 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-06-13 23:54:07 +0300 |
commit | 5e50380ddc99dd8c8c8067482b2dce186e7c3fb4 (patch) | |
tree | 7e5f438a3a30996351a7ee256ffd144e2dab45ad /source/blender/blenkernel/BKE_cloth.h | |
parent | 15e6f9012c84c4ebce41bf1928635a3abe046a55 (diff) | |
parent | 23d0361b30da481ffe71142d4efd336dfb1f27f2 (diff) |
Merge branch 'master' into asset-uuid
Diffstat (limited to 'source/blender/blenkernel/BKE_cloth.h')
-rw-r--r-- | source/blender/blenkernel/BKE_cloth.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index f5073ff7aa5..f25482570b1 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -93,9 +93,10 @@ typedef struct Cloth { struct Implicit_Data *implicit; /* our implicit solver connects to this pointer */ struct EdgeSet *edgeset; /* used for selfcollisions */ int last_frame; - float initial_mesh_volume; /* Initial volume of the mesh. Used for pressure */ - struct MEdge *edges; /* Used for hair collisions. */ - struct GHash *sew_edge_graph; /* Sewing edges represented using a GHash */ + float initial_mesh_volume; /* Initial volume of the mesh. Used for pressure */ + float average_acceleration[3]; /* Moving average of overall acceleration. */ + struct MEdge *edges; /* Used for hair collisions. */ + struct GHash *sew_edge_graph; /* Sewing edges represented using a GHash */ } Cloth; /** |