diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-08-10 18:06:33 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-08-10 18:06:33 +0300 |
| commit | 01537f7a9dfbba9afbb5670cf5ffa818f8b7376e (patch) | |
| tree | 6f2a93ccac0cc9266cf208ac12619bb93714e2b9 /source/blender/python | |
| parent | 1baba83bb009b820422692eb9d6a51d16a6c09cc (diff) | |
| parent | c0340ec89393055bbb0ba0432b9edb5d70b3711c (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/mathutils/mathutils_bvhtree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index 80a72696d77..0c53639c67d 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -549,8 +549,8 @@ static bool py_bvhtree_overlap_cb(void *userdata, int index_a, int index_b, int } } - return (isect_tri_tri_epsilon_v3( - UNPACK3(tri_a_co), UNPACK3(tri_b_co), ix_pair[0], ix_pair[1], data->epsilon) && + return (isect_tri_tri_v3( + UNPACK3(tri_a_co), UNPACK3(tri_b_co), ix_pair[0], ix_pair[1]) && ((verts_shared == 0) || (len_squared_v3v3(ix_pair[0], ix_pair[1]) > data->epsilon))); } |