diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-15 16:15:55 +0300 |
commit | df1c88b652e6977491b7f2b019c326518ccdc320 (patch) | |
tree | d3cfdaef8f3ea0744f5f666679dadc6425501711 /source/blender/blenkernel/intern/bvhutils.c | |
parent | 2589f55a55bc9682111ab266bb89d8f08713f374 (diff) | |
parent | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/bvhutils.c')
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 775499304d4..cd2c7194237 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -411,7 +411,7 @@ static BVHTree *bvhtree_from_editmesh_verts_create_tree( BMVert *eve = BM_vert_at_index(em->bm, i); BLI_bvhtree_insert(tree, i, eve->co, 1); } - BLI_assert(BLI_bvhtree_get_size(tree) == verts_num_active); + BLI_assert(BLI_bvhtree_get_len(tree) == verts_num_active); BLI_bvhtree_balance(tree); } @@ -440,7 +440,7 @@ static BVHTree *bvhtree_from_mesh_verts_create_tree( } BLI_bvhtree_insert(tree, i, vert[i].co, 1); } - BLI_assert(BLI_bvhtree_get_size(tree) == verts_num_active); + BLI_assert(BLI_bvhtree_get_len(tree) == verts_num_active); BLI_bvhtree_balance(tree); } @@ -612,7 +612,7 @@ static BVHTree *bvhtree_from_editmesh_edges_create_tree( BLI_bvhtree_insert(tree, i, co[0], 2); } - BLI_assert(BLI_bvhtree_get_size(tree) == edges_num_active); + BLI_assert(BLI_bvhtree_get_len(tree) == edges_num_active); BLI_bvhtree_balance(tree); } @@ -829,7 +829,7 @@ static BVHTree *bvhtree_from_mesh_faces_create_tree( BLI_bvhtree_insert(tree, i, co[0], face[i].v4 ? 4 : 3); } } - BLI_assert(BLI_bvhtree_get_size(tree) == faces_num_active); + BLI_assert(BLI_bvhtree_get_len(tree) == faces_num_active); BLI_bvhtree_balance(tree); } } @@ -990,7 +990,7 @@ static BVHTree *bvhtree_from_editmesh_looptri_create_tree( } } } - BLI_assert(BLI_bvhtree_get_size(tree) == looptri_num_active); + BLI_assert(BLI_bvhtree_get_len(tree) == looptri_num_active); BLI_bvhtree_balance(tree); } } @@ -1032,7 +1032,7 @@ static BVHTree *bvhtree_from_mesh_looptri_create_tree( BLI_bvhtree_insert(tree, i, co[0], 3); } } - BLI_assert(BLI_bvhtree_get_size(tree) == looptri_num_active); + BLI_assert(BLI_bvhtree_get_len(tree) == looptri_num_active); BLI_bvhtree_balance(tree); } } |