diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-06 04:50:56 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-06 04:56:44 +0300 |
commit | bba4a09b2f0b73f0a38e1eccc403a4cef536f703 (patch) | |
tree | 4fcd36e2643a2e4d476d3bcf00c346e7ac81c642 /source/blender/editors/sculpt_paint/paint_vertex.c | |
parent | 1af83aa2dd895ca0e6e7a31d64c19ef4d3241298 (diff) |
Cleanup: use 'BKE_' prefix for BKE_deform API calls
- Use 'BKE_object_defgroup' prefix for object functions.
- Rename 'defvert_verify_index' to 'defvert_ensure_index'
since this adds the group if it isn't found.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 6e96b9acca5..9634f6bacd2 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -172,7 +172,7 @@ static MDeformVert *defweight_prev_init(MDeformVert *dvert_prev, MDeformVert *dv_prev = &dvert_prev[index]; if (dv_prev->flag == 1) { dv_prev->flag = 0; - defvert_copy(dv_prev, dv_curr); + BKE_defvert_copy(dv_prev, dv_curr); } return dv_prev; } @@ -752,10 +752,10 @@ static void do_weight_paint_vertex_single( } if (wp->flag & VP_FLAG_VGROUP_RESTRICT) { - dw = defvert_find_index(dv, wpi->active.index); + dw = BKE_defvert_find_index(dv, wpi->active.index); } else { - dw = defvert_verify_index(dv, wpi->active.index); + dw = BKE_defvert_ensure_index(dv, wpi->active.index); } if (dw == NULL) { @@ -766,7 +766,7 @@ static void do_weight_paint_vertex_single( if (index_mirr != -1) { dv_mirr = &me->dvert[index_mirr]; if (wp->flag & VP_FLAG_VGROUP_RESTRICT) { - dw_mirr = defvert_find_index(dv_mirr, vgroup_mirr); + dw_mirr = BKE_defvert_find_index(dv_mirr, vgroup_mirr); if (dw_mirr == NULL) { index_mirr = vgroup_mirr = -1; @@ -775,13 +775,13 @@ static void do_weight_paint_vertex_single( } else { if (index != index_mirr) { - dw_mirr = defvert_verify_index(dv_mirr, vgroup_mirr); + dw_mirr = BKE_defvert_ensure_index(dv_mirr, vgroup_mirr); } else { /* dv and dv_mirr are the same */ int totweight_prev = dv_mirr->totweight; int dw_offset = (int)(dw - dv_mirr->dw); - dw_mirr = defvert_verify_index(dv_mirr, vgroup_mirr); + dw_mirr = BKE_defvert_ensure_index(dv_mirr, vgroup_mirr); /* if we added another, get our old one back */ if (totweight_prev != dv_mirr->totweight) { @@ -802,7 +802,7 @@ static void do_weight_paint_vertex_single( defweight_prev_init(dvert_prev, me->dvert, index_mirr); } - weight_prev = defvert_find_weight(dv_prev, wpi->active.index); + weight_prev = BKE_defvert_find_weight(dv_prev, wpi->active.index); } else { weight_prev = dw->weight; @@ -1694,7 +1694,7 @@ static float wpaint_get_active_weight(const MDeformVert *dv, const WeightPaintIn return weight; } else { - return defvert_find_weight(dv, wpi->active.index); + return BKE_defvert_find_weight(dv, wpi->active.index); } } |