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/blenkernel/intern/constraint.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/blenkernel/intern/constraint.c')
-rw-r--r--source/blender/blenkernel/intern/constraint.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 3df1a84a0c9..c1492810a11 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -372,7 +372,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
BMEditMesh *em = BKE_editmesh_from_object(ob);
float plane[3];
float imat[3][3], tmat[3][3];
- const int defgroup = defgroup_name_index(ob, substring);
+ const int defgroup = BKE_object_defgroup_name_index(ob, substring);
/* initialize target matrix using target matrix */
copy_m4_m4(mat, ob->obmat);
@@ -396,7 +396,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
/* get the average of all verts with that are in the vertex-group */
for (int i = 0; i < numVerts; i++, dv++, mv++) {
- MDeformWeight *dw = defvert_find_index(dv, defgroup);
+ MDeformWeight *dw = BKE_defvert_find_index(dv, defgroup);
if (dw && dw->weight > 0.0f) {
float nor[3];
@@ -415,7 +415,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
BM_ITER_MESH (v, &iter, em->bm, BM_VERTS_OF_MESH) {
MDeformVert *dv = CustomData_bmesh_get(&em->bm->vdata, v->head.data, CD_MDEFORMVERT);
- MDeformWeight *dw = defvert_find_index(dv, defgroup);
+ MDeformWeight *dw = BKE_defvert_find_index(dv, defgroup);
if (dw && dw->weight > 0.0f) {
madd_v3_v3fl(vec, v->co, dw->weight);
@@ -481,7 +481,7 @@ static void contarget_get_lattice_mat(Object *ob, const char *substring, float m
float vec[3] = {0.0f, 0.0f, 0.0f}, tvec[3];
int grouped = 0;
int i, n;
- const int defgroup = defgroup_name_index(ob, substring);
+ const int defgroup = BKE_object_defgroup_name_index(ob, substring);
/* initialize target matrix using target matrix */
copy_m4_m4(mat, ob->obmat);
@@ -499,7 +499,7 @@ static void contarget_get_lattice_mat(Object *ob, const char *substring, float m
*/
for (i = 0; i < tot_verts; i++, dv++) {
for (n = 0; n < dv->totweight; n++) {
- MDeformWeight *dw = defvert_find_index(dv, defgroup);
+ MDeformWeight *dw = BKE_defvert_find_index(dv, defgroup);
if (dw && dw->weight > 0.0f) {
/* copy coordinates of point to temporary vector, then add to find average */
memcpy(tvec, co ? co : bp->vec, 3 * sizeof(float));