diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-23 14:05:55 +0300 |
| commit | 8eb8aa49397fb038ffa98dbe5dc4aed86e7b3e94 (patch) | |
| tree | f5742a0f4414a99bd6738aae9cf4dc21b307fbfc /source/blender/blenkernel/intern/collision.c | |
| parent | da00a50f7f48bfd95924705e69babea41f9d7b2b (diff) | |
| parent | 7cc2b27099b7435cc1a29a48ae0e4c8335d811f3 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index c1872c92418..ee3c38b9282 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -180,8 +180,8 @@ static void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3 /* dot_v3v3 */ #define INPR(v1, v2) ( (v1)[0] * (v2)[0] + (v1)[1] * (v2)[1] + (v1)[2] * (v2)[2]) - double tempV1[3], tempV2[3], tempV4[3]; - double a, b, c, d, e, f; + double tempV1[3], tempV2[3], tempV4[3]; + double a, b, c, d, e, f; VECSUB ( tempV1, p1, p3 ); VECSUB ( tempV2, p2, p3 ); |