Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-06 04:50:56 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-06 04:56:44 +0300
commitbba4a09b2f0b73f0a38e1eccc403a4cef536f703 (patch)
tree4fcd36e2643a2e4d476d3bcf00c346e7ac81c642 /source/blender/modifiers/intern/MOD_weightvg_util.c
parent1af83aa2dd895ca0e6e7a31d64c19ef4d3241298 (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/modifiers/intern/MOD_weightvg_util.c')
-rw-r--r--source/blender/modifiers/intern/MOD_weightvg_util.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.c b/source/blender/modifiers/intern/MOD_weightvg_util.c
index c63065eec40..e93ab608498 100644
--- a/source/blender/modifiers/intern/MOD_weightvg_util.c
+++ b/source/blender/modifiers/intern/MOD_weightvg_util.c
@@ -212,7 +212,7 @@ void weightvg_do_mask(const ModifierEvalContext *ctx,
MEM_freeN(tex_co);
}
- else if ((ref_didx = defgroup_name_index(ob, defgrp_name)) != -1) {
+ else if ((ref_didx = BKE_object_defgroup_name_index(ob, defgrp_name)) != -1) {
MDeformVert *dvert = NULL;
/* Check whether we want to set vgroup weights from a constant weight factor or a vertex
@@ -232,8 +232,8 @@ void weightvg_do_mask(const ModifierEvalContext *ctx,
for (i = 0; i < num; i++) {
int idx = indices ? indices[i] : i;
const float f = invert_vgroup_mask ?
- 1.0f - defvert_find_weight(&dvert[idx], ref_didx) * fact :
- defvert_find_weight(&dvert[idx], ref_didx) * fact;
+ 1.0f - BKE_defvert_find_weight(&dvert[idx], ref_didx) * fact :
+ BKE_defvert_find_weight(&dvert[idx], ref_didx) * fact;
org_w[i] = (new_w[i] * f) + (org_w[i] * (1.0f - f));
/* If that vertex is not in ref vgroup, assume null factor, and hence do nothing! */
}
@@ -271,7 +271,7 @@ void weightvg_update_vg(MDeformVert *dvert,
float w = weights[i];
MDeformVert *dv = &dvert[indices ? indices[i] : i];
MDeformWeight *dw = dws ? dws[i] :
- ((defgrp_idx >= 0) ? defvert_find_index(dv, defgrp_idx) : NULL);
+ ((defgrp_idx >= 0) ? BKE_defvert_find_index(dv, defgrp_idx) : NULL);
/* Never allow weights out of [0.0, 1.0] range. */
CLAMP(w, 0.0f, 1.0f);
@@ -279,7 +279,7 @@ void weightvg_update_vg(MDeformVert *dvert,
/* If the vertex is in this vgroup, remove it if needed, or just update it. */
if (dw != NULL) {
if (do_rem && w < rem_thresh) {
- defvert_remove_group(dv, dw);
+ BKE_defvert_remove_group(dv, dw);
}
else {
dw->weight = w;
@@ -287,7 +287,7 @@ void weightvg_update_vg(MDeformVert *dvert,
}
/* Else, add it if needed! */
else if (do_add && w > add_thresh) {
- defvert_add_index_notest(dv, defgrp_idx, w);
+ BKE_defvert_add_index_notest(dv, defgrp_idx, w);
}
}
}