diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-30 17:33:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-01 17:10:38 +0300 |
| commit | 2090b3e5ac41b5f5dffcdbd3d4c4b5ac0b84473d (patch) | |
| tree | 8fd76fa42485f10c0b943bf3e009d8ffc348e027 /source/blender/blenkernel/BKE_pbvh.h | |
| parent | 6b3887da4d7414cdc3e4eb6589484a8376e2a307 (diff) | |
Cleanup: internal sculpt refactoring related to multires, no user visible changes
Diffstat (limited to 'source/blender/blenkernel/BKE_pbvh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_pbvh.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index fbf593496cf..dedf76ee839 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -214,7 +214,8 @@ int BKE_pbvh_count_grid_quads(BLI_bitmap **grid_hidden, /* multires level, only valid for type == PBVH_GRIDS */ const struct CCGKey *BKE_pbvh_get_grid_key(const PBVH *pbvh); -struct CCGElem **BKE_pbvh_get_grids(const PBVH *pbvh, int *num_grids); +struct CCGElem **BKE_pbvh_get_grids(const PBVH *pbvh); +int BKE_pbvh_get_grid_num_vertices(const PBVH *pbvh); /* Only valid for type == PBVH_BMESH */ struct BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh); @@ -362,6 +363,7 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node, PBVHVertexIter *vi, int mo if (vi.grids) { \ vi.width = vi.gridsize; \ vi.height = vi.gridsize; \ + vi.index = vi.grid_indices[vi.g] * vi.key.grid_area - 1; \ vi.grid = vi.grids[vi.grid_indices[vi.g]]; \ if (mode == PBVH_ITER_UNIQUE) \ vi.gh = vi.grid_hidden[vi.grid_indices[vi.g]]; \ @@ -378,6 +380,7 @@ void pbvh_vertex_iter_init(PBVH *bvh, PBVHNode *node, PBVHVertexIter *vi, int mo vi.fno = CCG_elem_no(&vi.key, vi.grid); \ vi.mask = vi.key.has_mask ? CCG_elem_mask(&vi.key, vi.grid) : NULL; \ vi.grid = CCG_elem_next(&vi.key, vi.grid); \ + vi.index++; \ if (vi.gh) { \ if (BLI_BITMAP_TEST(vi.gh, vi.gy * vi.gridsize + vi.gx)) \ continue; \ |