diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-01 14:02:44 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-01 17:10:38 +0300 |
| commit | 6b3887da4d7414cdc3e4eb6589484a8376e2a307 (patch) | |
| tree | 21f59b9bcf82a6151824f65bb7e1b0e5a3c8eb9b /source/blender/editors/sculpt_paint | |
| parent | b1baebd0224a806082ffec99fd6db0667e0ef49d (diff) | |
Cleanup: slightly more efficient access to PBVH multires grid key
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_hide.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 3e55a5d1b36..026dc39c668 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -134,7 +134,6 @@ static void partialvis_update_grids(Depsgraph *depsgraph, float planes[4][4]) { CCGElem **grids; - CCGKey key; BLI_bitmap **grid_hidden; int *grid_indices, totgrid, i; bool any_changed = false, any_visible = false; @@ -142,7 +141,7 @@ static void partialvis_update_grids(Depsgraph *depsgraph, /* get PBVH data */ BKE_pbvh_node_get_grids(pbvh, node, &grid_indices, &totgrid, NULL, NULL, &grids); grid_hidden = BKE_pbvh_grid_hidden(pbvh); - BKE_pbvh_get_grid_key(pbvh, &key); + CCGKey key = *BKE_pbvh_get_grid_key(pbvh); sculpt_undo_push_node(ob, node, SCULPT_UNDO_HIDDEN); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 075efd19c08..e9d4dba937d 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -2581,7 +2581,6 @@ static void do_smooth_brush_multires_task_cb_ex(void *__restrict userdata, float bstrength = data->strength; CCGElem **griddata, *gddata; - CCGKey key; float(*tmpgrid_co)[3] = NULL; float tmprow_co[2][3]; @@ -2600,7 +2599,7 @@ static void do_smooth_brush_multires_task_cb_ex(void *__restrict userdata, BKE_pbvh_node_get_grids( ss->pbvh, data->nodes[n], &grid_indices, &totgrid, NULL, &gridsize, &griddata); - BKE_pbvh_get_grid_key(ss->pbvh, &key); + CCGKey key = *BKE_pbvh_get_grid_key(ss->pbvh); grid_hidden = BKE_pbvh_grid_hidden(ss->pbvh); |