diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-10 18:58:22 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-10 18:58:22 +0400 |
| commit | f838e3632d6cdf5fcc11f4c3ed044afeafa6e23f (patch) | |
| tree | 21dab2f7fee401a3212a622ed952b2decd737b1d /source/blender/blenlib/intern/polyfill2d.c | |
| parent | 002cb94cc68f150344f8ee213c9b02c0b47c3f65 (diff) | |
| parent | 3cd2c6145ae12956757141a1ea1f58f5eddf0db1 (diff) | |
Merge branch 'master' into soc-2014-shapekey
Conflicts:
source/blender/editors/object/object_shapekey.c
Diffstat (limited to 'source/blender/blenlib/intern/polyfill2d.c')
| -rw-r--r-- | source/blender/blenlib/intern/polyfill2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/polyfill2d.c b/source/blender/blenlib/intern/polyfill2d.c index 71cda92842a..dd829e5d80a 100644 --- a/source/blender/blenlib/intern/polyfill2d.c +++ b/source/blender/blenlib/intern/polyfill2d.c @@ -387,7 +387,7 @@ static bool kdtree2d_isect_tri_recursive( (span_tri_v2_sign(tri_coords[1], tri_coords[2], co) != CONCAVE) && (span_tri_v2_sign(tri_coords[2], tri_coords[0], co) != CONCAVE)) { - if (!ELEM3(node->index, tri_index[0], tri_index[1], tri_index[2])) { + if (!ELEM(node->index, tri_index[0], tri_index[1], tri_index[2])) { return true; } } |