diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index ec257a2f394..dab5631d716 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -81,6 +81,8 @@ typedef struct CollPair { float pa[3], pb[3]; // collision point p1 on face1, p2 on face2 int flag; float time; // collision time, from 0 up to 1 + + /* mesh-mesh collision */ #ifdef WITH_ELTOPO /*either ap* or bp* can be set, but not both*/ float bary[3]; int ap1, ap2, ap3, collp, bp1, bp2, bp3; @@ -89,6 +91,9 @@ typedef struct CollPair { int ap1, ap2, ap3, bp1, bp2, bp3; #endif int pointsb[4]; + + /* hair collision */ + float va[3], vb[3]; /* */ } CollPair; |