diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 15:36:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 15:39:08 +0300 |
| commit | ccdacf1c9b31b15e188aa9e9adb044ffd0ca0da4 (patch) | |
| tree | 086fc08c0a7d7ecefb4ed6666a3c2fd813142c8b /source/blender/blenkernel/intern/pbvh.c | |
| parent | 4da6c496137042d4c90292f5567a6702a3df3323 (diff) | |
Cleanup: use '_len' instead of '_size' w/ BLI API
- When returning the number of items in a collection use BLI_*_len()
- Keep _size() for size in bytes.
- Keep _count() for data structures that don't store length
(hint this isn't a simple getter).
See P611 to apply instead of manually resolving conflicts.
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index d926c96c0d8..51d50b061de 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1294,7 +1294,7 @@ void BKE_pbvh_get_grid_updates(PBVH *bvh, bool clear, void ***r_gridfaces, int * pbvh_iter_end(&iter); - const int tot = BLI_gset_size(face_set); + const int tot = BLI_gset_len(face_set); if (tot == 0) { *r_totface = 0; *r_gridfaces = NULL; @@ -1433,8 +1433,8 @@ void BKE_pbvh_node_num_verts( if (r_uniquevert) *r_uniquevert = node->uniq_verts; break; case PBVH_BMESH: - tot = BLI_gset_size(node->bm_unique_verts); - if (r_totvert) *r_totvert = tot + BLI_gset_size(node->bm_other_verts); + tot = BLI_gset_len(node->bm_unique_verts); + if (r_totvert) *r_totvert = tot + BLI_gset_len(node->bm_other_verts); if (r_uniquevert) *r_uniquevert = tot; break; } |