diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-02 07:44:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-02 07:44:02 +0400 |
| commit | 07ee0dcc74042779511528975c2ae7956abf7478 (patch) | |
| tree | 09fd0af2a6c39cfa813193867a8ff1948a85ecac /source/blender/blenkernel/BKE_collision.h | |
| parent | 4548063f971179f56847a4a2588ee18dfc56acc4 (diff) | |
build system changes to eltopo, re-applied.
Diffstat (limited to 'source/blender/blenkernel/BKE_collision.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_collision.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 7018a638831..4048ee2f457 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -64,7 +64,7 @@ struct LinkNode; typedef enum { COLLISION_IN_FUTURE = (1 << 1), -#ifdef USE_ELTOPO +#ifdef WITH_ELTOPO COLLISION_USE_COLLFACE = (1 << 2), COLLISION_IS_EDGES = (1 << 3), #endif @@ -85,7 +85,7 @@ 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 -#ifdef USE_ELTOPO /*either ap* or bp* can be set, but not both*/ +#ifdef WITH_ELTOPO /*either ap* or bp* can be set, but not both*/ float bary[3]; int ap1, ap2, ap3, collp, bp1, bp2, bp3; int collface; |