From bba4a09b2f0b73f0a38e1eccc403a4cef536f703 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Mar 2020 12:50:56 +1100 Subject: 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. --- source/blender/blenkernel/BKE_deform.h | 126 +++++++++-------- source/blender/blenkernel/intern/armature.c | 4 +- source/blender/blenkernel/intern/constraint.c | 10 +- source/blender/blenkernel/intern/data_transfer.c | 2 +- source/blender/blenkernel/intern/deform.c | 171 ++++++++++++----------- source/blender/blenkernel/intern/dynamicpaint.c | 8 +- source/blender/blenkernel/intern/fluid.c | 6 +- source/blender/blenkernel/intern/gpencil.c | 16 +-- source/blender/blenkernel/intern/key.c | 6 +- source/blender/blenkernel/intern/lattice.c | 26 ++-- source/blender/blenkernel/intern/mesh_mirror.c | 6 +- source/blender/blenkernel/intern/mesh_validate.c | 2 +- source/blender/blenkernel/intern/object.c | 4 +- source/blender/blenkernel/intern/object_deform.c | 23 +-- source/blender/blenkernel/intern/particle.c | 4 +- source/blender/blenkernel/intern/shrinkwrap.c | 6 +- source/blender/blenkernel/intern/softbody.c | 22 +-- 17 files changed, 228 insertions(+), 214 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index 2911002b9e9..222678407d1 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -37,35 +37,35 @@ struct MPoly; struct Object; struct bDeformGroup; -struct bDeformGroup *BKE_defgroup_new(struct Object *ob, const char *name); -void defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2); -struct bDeformGroup *defgroup_duplicate(const struct bDeformGroup *ingroup); -struct bDeformGroup *defgroup_find_name(struct Object *ob, const char *name); -int *defgroup_flip_map(struct Object *ob, int *flip_map_len, const bool use_default); -int *defgroup_flip_map_single(struct Object *ob, - int *flip_map_len, - const bool use_default, - int defgroup); -int defgroup_flip_index(struct Object *ob, int index, const bool use_default); -int defgroup_name_index(struct Object *ob, const char *name); -void defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob); +struct bDeformGroup *BKE_object_defgroup_new(struct Object *ob, const char *name); +void BKE_defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2); +struct bDeformGroup *BKE_defgroup_duplicate(const struct bDeformGroup *ingroup); +struct bDeformGroup *BKE_object_defgroup_find_name(struct Object *ob, const char *name); +int *BKE_object_defgroup_flip_map(struct Object *ob, int *flip_map_len, const bool use_default); +int *BKE_object_defgroup_flip_map_single(struct Object *ob, + int *flip_map_len, + const bool use_default, + int defgroup); +int BKE_object_defgroup_flip_index(struct Object *ob, int index, const bool use_default); +int BKE_object_defgroup_name_index(struct Object *ob, const char *name); +void BKE_object_defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob); -struct MDeformWeight *defvert_find_index(const struct MDeformVert *dv, const int defgroup); -struct MDeformWeight *defvert_verify_index(struct MDeformVert *dv, const int defgroup); -void defvert_add_index_notest(struct MDeformVert *dv, int defgroup, const float weight); -void defvert_remove_group(struct MDeformVert *dvert, struct MDeformWeight *dw); -void defvert_clear(struct MDeformVert *dvert); -int defvert_find_shared(const struct MDeformVert *dvert_a, const struct MDeformVert *dvert_b); -bool defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot); +struct MDeformWeight *BKE_defvert_find_index(const struct MDeformVert *dv, const int defgroup); +struct MDeformWeight *BKE_defvert_ensure_index(struct MDeformVert *dv, const int defgroup); +void BKE_defvert_add_index_notest(struct MDeformVert *dv, int defgroup, const float weight); +void BKE_defvert_remove_group(struct MDeformVert *dvert, struct MDeformWeight *dw); +void BKE_defvert_clear(struct MDeformVert *dvert); +int BKE_defvert_find_shared(const struct MDeformVert *dvert_a, const struct MDeformVert *dvert_b); +bool BKE_defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot); void BKE_defvert_array_free_elems(struct MDeformVert *dvert, int totvert); void BKE_defvert_array_free(struct MDeformVert *dvert, int totvert); void BKE_defvert_array_copy(struct MDeformVert *dst, const struct MDeformVert *src, int totvert); -float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup); -float defvert_array_find_weight_safe(const struct MDeformVert *dvert, - const int index, - const int defgroup); +float BKE_defvert_find_weight(const struct MDeformVert *dvert, const int defgroup); +float BKE_defvert_array_find_weight_safe(const struct MDeformVert *dvert, + const int index, + const int defgroup); float BKE_defvert_multipaint_collective_weight(const struct MDeformVert *dv, int defbase_tot, @@ -73,45 +73,47 @@ float BKE_defvert_multipaint_collective_weight(const struct MDeformVert *dv, int defbase_tot_sel, bool do_autonormalize); -void defvert_copy(struct MDeformVert *dvert_dst, const struct MDeformVert *dvert_src); -void defvert_copy_subset(struct MDeformVert *dvert_dst, - const struct MDeformVert *dvert_src, - const bool *vgroup_subset, - const int vgroup_tot); -void defvert_mirror_subset(struct MDeformVert *dvert_dst, - const struct MDeformVert *dvert_src, - const bool *vgroup_subset, - const int vgroup_tot, - const int *flip_map, - const int flip_map_len); -void defvert_copy_index(struct MDeformVert *dvert_dst, - const int defgroup_dst, - const struct MDeformVert *dvert_src, - const int defgroup_src); -void defvert_sync(struct MDeformVert *dvert_dst, - const struct MDeformVert *dvert_src, - const bool use_verify); -void defvert_sync_mapped(struct MDeformVert *dvert_dst, - const struct MDeformVert *dvert_src, - const int *flip_map, - const int flip_map_len, - const bool use_verify); -void defvert_remap(struct MDeformVert *dvert, int *map, const int map_len); -void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len); -void defvert_flip_merged(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len); -void defvert_normalize(struct MDeformVert *dvert); -void defvert_normalize_subset(struct MDeformVert *dvert, - const bool *vgroup_subset, - const int vgroup_tot); -void defvert_normalize_lock_single(struct MDeformVert *dvert, - const bool *vgroup_subset, - const int vgroup_tot, - const uint def_nr_lock); -void defvert_normalize_lock_map(struct MDeformVert *dvert, - const bool *vgroup_subset, - const int vgroup_tot, - const bool *lock_flags, - const int defbase_tot); +void BKE_defvert_copy(struct MDeformVert *dvert_dst, const struct MDeformVert *dvert_src); +void BKE_defvert_copy_subset(struct MDeformVert *dvert_dst, + const struct MDeformVert *dvert_src, + const bool *vgroup_subset, + const int vgroup_tot); +void BKE_defvert_mirror_subset(struct MDeformVert *dvert_dst, + const struct MDeformVert *dvert_src, + const bool *vgroup_subset, + const int vgroup_tot, + const int *flip_map, + const int flip_map_len); +void BKE_defvert_copy_index(struct MDeformVert *dvert_dst, + const int defgroup_dst, + const struct MDeformVert *dvert_src, + const int defgroup_src); +void BKE_defvert_sync(struct MDeformVert *dvert_dst, + const struct MDeformVert *dvert_src, + const bool use_verify); +void BKE_defvert_sync_mapped(struct MDeformVert *dvert_dst, + const struct MDeformVert *dvert_src, + const int *flip_map, + const int flip_map_len, + const bool use_verify); +void BKE_defvert_remap(struct MDeformVert *dvert, int *map, const int map_len); +void BKE_defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len); +void BKE_defvert_flip_merged(struct MDeformVert *dvert, + const int *flip_map, + const int flip_map_len); +void BKE_defvert_normalize(struct MDeformVert *dvert); +void BKE_defvert_normalize_subset(struct MDeformVert *dvert, + const bool *vgroup_subset, + const int vgroup_tot); +void BKE_defvert_normalize_lock_single(struct MDeformVert *dvert, + const bool *vgroup_subset, + const int vgroup_tot, + const uint def_nr_lock); +void BKE_defvert_normalize_lock_map(struct MDeformVert *dvert, + const bool *vgroup_subset, + const int vgroup_tot, + const bool *lock_flags, + const int defbase_tot); /* Utilities to 'extract' a given vgroup into a simple float array, * for verts, but also edges/polys/loops. */ diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 3216837ae16..f48f29406e3 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1533,7 +1533,7 @@ static void armature_vert_task(void *__restrict userdata, } if (armature_def_nr != -1 && dvert) { - armature_weight = defvert_find_weight(dvert, armature_def_nr); + armature_weight = BKE_defvert_find_weight(dvert, armature_def_nr); if (data->invert_vgroup) { armature_weight = 1.0f - armature_weight; @@ -1681,7 +1681,7 @@ void armature_deform_verts(Object *armOb, } /* get the def_nr for the overall armature vertex group if present */ - armature_def_nr = defgroup_name_index(target, defgrp_name); + armature_def_nr = BKE_object_defgroup_name_index(target, defgrp_name); if (ELEM(target->type, OB_MESH, OB_LATTICE, OB_GPENCIL)) { defbase_tot = BLI_listbase_count(&target->defbase); 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)); diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 0414c6d0a02..9fd04108746 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -1444,7 +1444,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph, if (vgroup_name) { mdef = CustomData_get_layer(&me_dst->vdata, CD_MDEFORMVERT); if (mdef) { - vg_idx = defgroup_name_index(ob_dst, vgroup_name); + vg_idx = BKE_object_defgroup_name_index(ob_dst, vgroup_name); } } diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 41ff9594cff..2ebf8231c09 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -52,7 +52,7 @@ #include "data_transfer_intern.h" -bDeformGroup *BKE_defgroup_new(Object *ob, const char *name) +bDeformGroup *BKE_object_defgroup_new(Object *ob, const char *name) { bDeformGroup *defgroup; @@ -63,26 +63,26 @@ bDeformGroup *BKE_defgroup_new(Object *ob, const char *name) BLI_strncpy(defgroup->name, name, sizeof(defgroup->name)); BLI_addtail(&ob->defbase, defgroup); - defgroup_unique_name(defgroup, ob); + BKE_object_defgroup_unique_name(defgroup, ob); BKE_object_batch_cache_dirty_tag(ob); return defgroup; } -void defgroup_copy_list(ListBase *outbase, const ListBase *inbase) +void BKE_defgroup_copy_list(ListBase *outbase, const ListBase *inbase) { bDeformGroup *defgroup, *defgroupn; BLI_listbase_clear(outbase); for (defgroup = inbase->first; defgroup; defgroup = defgroup->next) { - defgroupn = defgroup_duplicate(defgroup); + defgroupn = BKE_defgroup_duplicate(defgroup); BLI_addtail(outbase, defgroupn); } } -bDeformGroup *defgroup_duplicate(const bDeformGroup *ingroup) +bDeformGroup *BKE_defgroup_duplicate(const bDeformGroup *ingroup) { bDeformGroup *outgroup; @@ -106,15 +106,15 @@ bDeformGroup *defgroup_duplicate(const bDeformGroup *ingroup) * - do nothing if neither are set. * - add destination weight if needed */ -void defvert_copy_subset(MDeformVert *dvert_dst, - const MDeformVert *dvert_src, - const bool *vgroup_subset, - const int vgroup_tot) +void BKE_defvert_copy_subset(MDeformVert *dvert_dst, + const MDeformVert *dvert_src, + const bool *vgroup_subset, + const int vgroup_tot) { int defgroup; for (defgroup = 0; defgroup < vgroup_tot; defgroup++) { if (vgroup_subset[defgroup]) { - defvert_copy_index(dvert_dst, defgroup, dvert_src, defgroup); + BKE_defvert_copy_index(dvert_dst, defgroup, dvert_src, defgroup); } } } @@ -124,22 +124,22 @@ void defvert_copy_subset(MDeformVert *dvert_dst, * - do nothing if neither are set. * - add destination weight if needed */ -void defvert_mirror_subset(MDeformVert *dvert_dst, - const MDeformVert *dvert_src, - const bool *vgroup_subset, - const int vgroup_tot, - const int *flip_map, - const int flip_map_len) +void BKE_defvert_mirror_subset(MDeformVert *dvert_dst, + const MDeformVert *dvert_src, + const bool *vgroup_subset, + const int vgroup_tot, + const int *flip_map, + const int flip_map_len) { int defgroup; for (defgroup = 0; defgroup < vgroup_tot && defgroup < flip_map_len; defgroup++) { if (vgroup_subset[defgroup] && (dvert_dst != dvert_src || flip_map[defgroup] != defgroup)) { - defvert_copy_index(dvert_dst, flip_map[defgroup], dvert_src, defgroup); + BKE_defvert_copy_index(dvert_dst, flip_map[defgroup], dvert_src, defgroup); } } } -void defvert_copy(MDeformVert *dvert_dst, const MDeformVert *dvert_src) +void BKE_defvert_copy(MDeformVert *dvert_dst, const MDeformVert *dvert_src) { if (dvert_dst->totweight == dvert_src->totweight) { if (dvert_src->totweight) { @@ -167,23 +167,23 @@ void defvert_copy(MDeformVert *dvert_dst, const MDeformVert *dvert_src) * - do nothing if neither are set. * - add destination weight if needed. */ -void defvert_copy_index(MDeformVert *dvert_dst, - const int defgroup_dst, - const MDeformVert *dvert_src, - const int defgroup_src) +void BKE_defvert_copy_index(MDeformVert *dvert_dst, + const int defgroup_dst, + const MDeformVert *dvert_src, + const int defgroup_src) { MDeformWeight *dw_src, *dw_dst; - dw_src = defvert_find_index(dvert_src, defgroup_src); + dw_src = BKE_defvert_find_index(dvert_src, defgroup_src); if (dw_src) { /* source is valid, verify destination */ - dw_dst = defvert_verify_index(dvert_dst, defgroup_dst); + dw_dst = BKE_defvert_ensure_index(dvert_dst, defgroup_dst); dw_dst->weight = dw_src->weight; } else { /* source was NULL, assign zero, could also remove */ - dw_dst = defvert_find_index(dvert_dst, defgroup_dst); + dw_dst = BKE_defvert_find_index(dvert_dst, defgroup_dst); if (dw_dst) { dw_dst->weight = 0.0f; @@ -195,7 +195,7 @@ void defvert_copy_index(MDeformVert *dvert_dst, * Only sync over matching weights, don't add or remove groups * warning, loop within loop. */ -void defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, const bool use_verify) +void BKE_defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, const bool use_verify) { if (dvert_src->totweight && dvert_dst->totweight) { int i; @@ -203,10 +203,10 @@ void defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, const bo for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) { MDeformWeight *dw_dst; if (use_verify) { - dw_dst = defvert_verify_index(dvert_dst, dw_src->def_nr); + dw_dst = BKE_defvert_ensure_index(dvert_dst, dw_src->def_nr); } else { - dw_dst = defvert_find_index(dvert_dst, dw_src->def_nr); + dw_dst = BKE_defvert_find_index(dvert_dst, dw_src->def_nr); } if (dw_dst) { @@ -219,11 +219,11 @@ void defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, const bo /** * be sure all flip_map values are valid */ -void defvert_sync_mapped(MDeformVert *dvert_dst, - const MDeformVert *dvert_src, - const int *flip_map, - const int flip_map_len, - const bool use_verify) +void BKE_defvert_sync_mapped(MDeformVert *dvert_dst, + const MDeformVert *dvert_src, + const int *flip_map, + const int flip_map_len, + const bool use_verify) { if (dvert_src->totweight && dvert_dst->totweight) { int i; @@ -232,10 +232,10 @@ void defvert_sync_mapped(MDeformVert *dvert_dst, if (dw_src->def_nr < flip_map_len) { MDeformWeight *dw_dst; if (use_verify) { - dw_dst = defvert_verify_index(dvert_dst, flip_map[dw_src->def_nr]); + dw_dst = BKE_defvert_ensure_index(dvert_dst, flip_map[dw_src->def_nr]); } else { - dw_dst = defvert_find_index(dvert_dst, flip_map[dw_src->def_nr]); + dw_dst = BKE_defvert_find_index(dvert_dst, flip_map[dw_src->def_nr]); } if (dw_dst) { @@ -249,7 +249,7 @@ void defvert_sync_mapped(MDeformVert *dvert_dst, /** * be sure all flip_map values are valid */ -void defvert_remap(MDeformVert *dvert, int *map, const int map_len) +void BKE_defvert_remap(MDeformVert *dvert, int *map, const int map_len) { MDeformWeight *dw = dvert->dw; unsigned int i; @@ -263,9 +263,11 @@ void defvert_remap(MDeformVert *dvert, int *map, const int map_len) } /** - * Same as #defvert_normalize but takes a bool array. + * Same as #BKE_defvert_normalize but takes a bool array. */ -void defvert_normalize_subset(MDeformVert *dvert, const bool *vgroup_subset, const int vgroup_tot) +void BKE_defvert_normalize_subset(MDeformVert *dvert, + const bool *vgroup_subset, + const int vgroup_tot) { if (dvert->totweight == 0) { /* nothing */ @@ -301,7 +303,7 @@ void defvert_normalize_subset(MDeformVert *dvert, const bool *vgroup_subset, con } } -void defvert_normalize(MDeformVert *dvert) +void BKE_defvert_normalize(MDeformVert *dvert) { if (dvert->totweight == 0) { /* nothing */ @@ -331,12 +333,12 @@ void defvert_normalize(MDeformVert *dvert) } /** - * Same as defvert_normalize() if the locked vgroup is not a member of the subset + * Same as BKE_defvert_normalize() if the locked vgroup is not a member of the subset */ -void defvert_normalize_lock_single(MDeformVert *dvert, - const bool *vgroup_subset, - const int vgroup_tot, - const uint def_nr_lock) +void BKE_defvert_normalize_lock_single(MDeformVert *dvert, + const bool *vgroup_subset, + const int vgroup_tot, + const uint def_nr_lock) { if (dvert->totweight == 0) { /* nothing */ @@ -388,13 +390,13 @@ void defvert_normalize_lock_single(MDeformVert *dvert, } /** - * Same as defvert_normalize() if no locked vgroup is a member of the subset + * Same as BKE_defvert_normalize() if no locked vgroup is a member of the subset */ -void defvert_normalize_lock_map(MDeformVert *dvert, - const bool *vgroup_subset, - const int vgroup_tot, - const bool *lock_flags, - const int defbase_tot) +void BKE_defvert_normalize_lock_map(MDeformVert *dvert, + const bool *vgroup_subset, + const int vgroup_tot, + const bool *lock_flags, + const int defbase_tot) { if (dvert->totweight == 0) { /* nothing */ @@ -445,7 +447,7 @@ void defvert_normalize_lock_map(MDeformVert *dvert, } } -void defvert_flip(MDeformVert *dvert, const int *flip_map, const int flip_map_len) +void BKE_defvert_flip(MDeformVert *dvert, const int *flip_map, const int flip_map_len) { MDeformWeight *dw; int i; @@ -459,7 +461,7 @@ void defvert_flip(MDeformVert *dvert, const int *flip_map, const int flip_map_le } } -void defvert_flip_merged(MDeformVert *dvert, const int *flip_map, const int flip_map_len) +void BKE_defvert_flip_merged(MDeformVert *dvert, const int *flip_map, const int flip_map_len) { MDeformWeight *dw, *dw_cpy; float weight; @@ -470,7 +472,7 @@ void defvert_flip_merged(MDeformVert *dvert, const int *flip_map, const int flip if (dw->def_nr < flip_map_len) { if (flip_map[dw->def_nr] >= 0) { /* error checkers complain of this but we'll never get NULL return */ - dw_cpy = defvert_verify_index(dvert, flip_map[dw->def_nr]); + dw_cpy = BKE_defvert_ensure_index(dvert, flip_map[dw->def_nr]); dw = &dvert->dw[i]; /* in case array got realloced */ /* distribute weights: if only one of the vertex groups was @@ -484,14 +486,14 @@ void defvert_flip_merged(MDeformVert *dvert, const int *flip_map, const int flip } } -bDeformGroup *defgroup_find_name(Object *ob, const char *name) +bDeformGroup *BKE_object_defgroup_find_name(Object *ob, const char *name) { return (name && name[0] != '\0') ? BLI_findstring(&ob->defbase, name, offsetof(bDeformGroup, name)) : NULL; } -int defgroup_name_index(Object *ob, const char *name) +int BKE_object_defgroup_name_index(Object *ob, const char *name) { return (name && name[0] != '\0') ? BLI_findstringindex(&ob->defbase, name, offsetof(bDeformGroup, name)) : @@ -501,7 +503,7 @@ int defgroup_name_index(Object *ob, const char *name) /** * \note caller must free. */ -int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default) +int *BKE_object_defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default) { int defbase_tot = *flip_map_len = BLI_listbase_count(&ob->defbase); @@ -528,7 +530,7 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default) BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); if (!STREQ(name_flip, dg->name)) { - flip_num = defgroup_name_index(ob, name_flip); + flip_num = BKE_object_defgroup_name_index(ob, name_flip); if (flip_num >= 0) { map[i] = flip_num; map[flip_num] = i; /* save an extra lookup */ @@ -543,7 +545,10 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default) /** * \note caller must free. */ -int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_default, int defgroup) +int *BKE_object_defgroup_flip_map_single(Object *ob, + int *flip_map_len, + const bool use_default, + int defgroup) { int defbase_tot = *flip_map_len = BLI_listbase_count(&ob->defbase); @@ -563,7 +568,7 @@ int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_defa BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); if (!STREQ(name_flip, dg->name)) { - flip_num = defgroup_name_index(ob, name_flip); + flip_num = BKE_object_defgroup_name_index(ob, name_flip); if (flip_num != -1) { map[defgroup] = flip_num; @@ -575,7 +580,7 @@ int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_defa } } -int defgroup_flip_index(Object *ob, int index, const bool use_default) +int BKE_object_defgroup_flip_index(Object *ob, int index, const bool use_default) { bDeformGroup *dg = BLI_findlink(&ob->defbase, index); int flip_index = -1; @@ -585,7 +590,7 @@ int defgroup_flip_index(Object *ob, int index, const bool use_default) BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); if (!STREQ(name_flip, dg->name)) { - flip_index = defgroup_name_index(ob, name_flip); + flip_index = BKE_object_defgroup_name_index(ob, name_flip); } } @@ -616,7 +621,7 @@ static bool defgroup_unique_check(void *arg, const char *name) return defgroup_find_name_dupe(name, data->dg, data->ob); } -void defgroup_unique_name(bDeformGroup *dg, Object *ob) +void BKE_object_defgroup_unique_name(bDeformGroup *dg, Object *ob) { struct { Object *ob; @@ -628,9 +633,9 @@ void defgroup_unique_name(bDeformGroup *dg, Object *ob) BLI_uniquename_cb(defgroup_unique_check, &data, DATA_("Group"), '.', dg->name, sizeof(dg->name)); } -float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup) +float BKE_defvert_find_weight(const struct MDeformVert *dvert, const int defgroup) { - MDeformWeight *dw = defvert_find_index(dvert, defgroup); + MDeformWeight *dw = BKE_defvert_find_index(dvert, defgroup); return dw ? dw->weight : 0.0f; } @@ -641,9 +646,9 @@ float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup) * * This is a bit confusing, just saves some checks from the caller. */ -float defvert_array_find_weight_safe(const struct MDeformVert *dvert, - const int index, - const int defgroup) +float BKE_defvert_array_find_weight_safe(const struct MDeformVert *dvert, + const int index, + const int defgroup) { /* Invalid defgroup index means the vgroup selected is invalid, * does not exist, in that case it is OK to return 1.0 @@ -657,10 +662,10 @@ float defvert_array_find_weight_safe(const struct MDeformVert *dvert, return 0.0f; } - return defvert_find_weight(dvert + index, defgroup); + return BKE_defvert_find_weight(dvert + index, defgroup); } -MDeformWeight *defvert_find_index(const MDeformVert *dvert, const int defgroup) +MDeformWeight *BKE_defvert_find_index(const MDeformVert *dvert, const int defgroup) { if (dvert && defgroup >= 0) { MDeformWeight *dw = dvert->dw; @@ -684,7 +689,7 @@ MDeformWeight *defvert_find_index(const MDeformVert *dvert, const int defgroup) * * \note this function is mirrored in editmesh_tools.c, for use for editvertices. */ -MDeformWeight *defvert_verify_index(MDeformVert *dvert, const int defgroup) +MDeformWeight *BKE_defvert_ensure_index(MDeformVert *dvert, const int defgroup) { MDeformWeight *dw_new; @@ -694,7 +699,7 @@ MDeformWeight *defvert_verify_index(MDeformVert *dvert, const int defgroup) return NULL; } - dw_new = defvert_find_index(dvert, defgroup); + dw_new = BKE_defvert_find_index(dvert, defgroup); if (dw_new) { return dw_new; } @@ -722,7 +727,7 @@ MDeformWeight *defvert_verify_index(MDeformVert *dvert, const int defgroup) * * \warning this does NOT check for existing, assume caller already knows its not there. */ -void defvert_add_index_notest(MDeformVert *dvert, int defgroup, const float weight) +void BKE_defvert_add_index_notest(MDeformVert *dvert, int defgroup, const float weight) { MDeformWeight *dw_new; @@ -750,7 +755,7 @@ void defvert_add_index_notest(MDeformVert *dvert, int defgroup, const float weig * * \warning This function frees the given MDeformWeight, do not use it afterward! */ -void defvert_remove_group(MDeformVert *dvert, MDeformWeight *dw) +void BKE_defvert_remove_group(MDeformVert *dvert, MDeformWeight *dw) { if (dvert && dw) { int i = dw - dvert->dw; @@ -781,7 +786,7 @@ void defvert_remove_group(MDeformVert *dvert, MDeformWeight *dw) } } -void defvert_clear(MDeformVert *dvert) +void BKE_defvert_clear(MDeformVert *dvert) { if (dvert->dw) { MEM_freeN(dvert->dw); @@ -795,14 +800,14 @@ void defvert_clear(MDeformVert *dvert) * \return The first group index shared by both deform verts * or -1 if none are found. */ -int defvert_find_shared(const MDeformVert *dvert_a, const MDeformVert *dvert_b) +int BKE_defvert_find_shared(const MDeformVert *dvert_a, const MDeformVert *dvert_b) { if (dvert_a->totweight && dvert_b->totweight) { MDeformWeight *dw = dvert_a->dw; unsigned int i; for (i = dvert_a->totweight; i != 0; i--, dw++) { - if (dw->weight > 0.0f && defvert_find_weight(dvert_b, dw->def_nr) > 0.0f) { + if (dw->weight > 0.0f && BKE_defvert_find_weight(dvert_b, dw->def_nr) > 0.0f) { return dw->def_nr; } } @@ -814,7 +819,7 @@ int defvert_find_shared(const MDeformVert *dvert_a, const MDeformVert *dvert_b) /** * return true if has no weights */ -bool defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot) +bool BKE_defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot) { MDeformWeight *dw = dvert->dw; unsigned int i; @@ -931,7 +936,7 @@ void BKE_defvert_extract_vgroup_to_vertweights(MDeformVert *dvert, int i = num_verts; while (i--) { - const float w = defvert_find_weight(&dvert[i], defgroup); + const float w = BKE_defvert_find_weight(&dvert[i], defgroup); r_weights[i] = invert_vgroup ? (1.0f - w) : w; } } @@ -1059,7 +1064,7 @@ static void vgroups_datatransfer_interp(const CustomDataTransferLayerMap *laymap int i, j; MDeformWeight *dw_src; - MDeformWeight *dw_dst = defvert_find_index(data_dst, idx_dst); + MDeformWeight *dw_dst = BKE_defvert_find_index(data_dst, idx_dst); float weight_src = 0.0f, weight_dst = 0.0f; if (sources) { @@ -1085,7 +1090,7 @@ static void vgroups_datatransfer_interp(const CustomDataTransferLayerMap *laymap CLAMP(weight_src, 0.0f, 1.0f); if (!dw_dst) { - defvert_add_index_notest(data_dst, idx_dst, weight_src); + BKE_defvert_add_index_notest(data_dst, idx_dst, weight_src); } else { dw_dst->weight = weight_src; @@ -1181,7 +1186,7 @@ static bool data_transfer_layersmapping_vgroups_multisrc_to_dst(ListBase *r_map, for (dg_dst = ob_dst->defbase.first; dg_dst;) { bDeformGroup *dg_dst_next = dg_dst->next; - if (defgroup_name_index(ob_src, dg_dst->name) == -1) { + if (BKE_object_defgroup_name_index(ob_src, dg_dst->name) == -1) { BKE_object_defgroup_remove(ob_dst, dg_dst); } dg_dst = dg_dst_next; @@ -1194,7 +1199,7 @@ static bool data_transfer_layersmapping_vgroups_multisrc_to_dst(ListBase *r_map, continue; } - if ((idx_dst = defgroup_name_index(ob_dst, dg_src->name)) == -1) { + if ((idx_dst = BKE_object_defgroup_name_index(ob_dst, dg_src->name)) == -1) { if (use_create) { BKE_object_defgroup_add_name(ob_dst, dg_src->name); idx_dst = ob_dst->actdef - 1; @@ -1326,7 +1331,7 @@ bool data_transfer_layersmapping_vgroups(ListBase *r_map, } else if (tolayers == DT_LAYERS_NAME_DST) { bDeformGroup *dg_src = BLI_findlink(&ob_src->defbase, idx_src); - if ((idx_dst = defgroup_name_index(ob_dst, dg_src->name)) == -1) { + if ((idx_dst = BKE_object_defgroup_name_index(ob_dst, dg_src->name)) == -1) { if (!use_create) { return true; } diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index c434a97b890..b8f9eac0f6c 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -355,7 +355,7 @@ bool dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, Object return (CustomData_get_named_layer_index(&me->ldata, CD_MLOOPCOL, name) != -1); } else if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) { - return (defgroup_name_index(ob, name) != -1); + return (BKE_object_defgroup_name_index(ob, name) != -1); } } @@ -2015,7 +2015,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object * } /* vertex group paint */ else if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) { - int defgrp_index = defgroup_name_index(ob, surface->output_name); + int defgrp_index = BKE_object_defgroup_name_index(ob, surface->output_name); MDeformVert *dvert = CustomData_get_layer(&result->vdata, CD_MDEFORMVERT); float *weight = (float *)sData->type_data; @@ -2030,13 +2030,13 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd, Object * int i; for (i = 0; i < sData->total_points; i++) { MDeformVert *dv = &dvert[i]; - MDeformWeight *def_weight = defvert_find_index(dv, defgrp_index); + MDeformWeight *def_weight = BKE_defvert_find_index(dv, defgrp_index); /* skip if weight value is 0 and no existing weight is found */ if ((def_weight != NULL) || (weight[i] != 0.0f)) { /* if not found, add a weight for it */ if (def_weight == NULL) { - def_weight = defvert_verify_index(dv, defgrp_index); + def_weight = BKE_defvert_ensure_index(dv, defgrp_index); } /* set weight value */ diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 9e325527fc2..977b449f6d3 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -1938,9 +1938,9 @@ static void sample_mesh(FluidFlowSettings *mfs, /* Apply vertex group influence if it is being used. */ if (defgrp_index != -1 && dvert) { - float weight_mask = defvert_find_weight(&dvert[v1], defgrp_index) * weights[0] + - defvert_find_weight(&dvert[v2], defgrp_index) * weights[1] + - defvert_find_weight(&dvert[v3], defgrp_index) * weights[2]; + float weight_mask = BKE_defvert_find_weight(&dvert[v1], defgrp_index) * weights[0] + + BKE_defvert_find_weight(&dvert[v2], defgrp_index) * weights[1] + + BKE_defvert_find_weight(&dvert[v3], defgrp_index) * weights[2]; emission_strength *= weight_mask; } diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 2a84184cfe7..747ffb92ad5 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1427,14 +1427,14 @@ void BKE_gpencil_vgroup_remove(Object *ob, bDeformGroup *defgroup) if (gps->dvert != NULL) { for (int i = 0; i < gps->totpoints; i++) { dvert = &gps->dvert[i]; - MDeformWeight *dw = defvert_find_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dvert, def_nr); if (dw != NULL) { - defvert_remove_group(dvert, dw); + BKE_defvert_remove_group(dvert, dw); } else { /* Reorganize weights for other groups after deleted one. */ for (int g = 0; g < totgrp; g++) { - dw = defvert_find_index(dvert, g); + dw = BKE_defvert_find_index(dvert, g); if ((dw != NULL) && (dw->def_nr > def_nr)) { dw->def_nr--; } @@ -1524,8 +1524,8 @@ static void stroke_interpolate_deform_weights( int i; for (i = 0; i < vert->totweight; i++) { - float wl = defvert_find_weight(vl, vert->dw[i].def_nr); - float wr = defvert_find_weight(vr, vert->dw[i].def_nr); + float wl = BKE_defvert_find_weight(vl, vert->dw[i].def_nr); + float wr = BKE_defvert_find_weight(vr, vert->dw[i].def_nr); vert->dw[i].weight = interpf(wr, wl, ratio); } } @@ -2835,16 +2835,16 @@ bool BKE_gpencil_close_stroke(bGPDstroke *gps) /* Set weights. */ if (gps->dvert != NULL) { MDeformVert *dvert1 = &gps->dvert[old_tot - 1]; - MDeformWeight *dw1 = defvert_verify_index(dvert1, 0); + MDeformWeight *dw1 = BKE_defvert_ensure_index(dvert1, 0); float weight_1 = dw1 ? dw1->weight : 0.0f; MDeformVert *dvert2 = &gps->dvert[0]; - MDeformWeight *dw2 = defvert_verify_index(dvert2, 0); + MDeformWeight *dw2 = BKE_defvert_ensure_index(dvert2, 0); float weight_2 = dw2 ? dw2->weight : 0.0f; MDeformVert *dvert_final = &gps->dvert[old_tot + i - 1]; dvert_final->totweight = 0; - MDeformWeight *dw = defvert_verify_index(dvert_final, 0); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert_final, 0); if (dvert_final->dw) { dw->weight = interpf(weight_2, weight_1, step); } diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 22c05b53780..c5ee20d00dd 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -1206,7 +1206,7 @@ static float *get_weights_array(Object *ob, char *vgroup, WeightsArrayCache *cac } /* find the group (weak loop-in-loop) */ - defgrp_index = defgroup_name_index(ob, vgroup); + defgrp_index = BKE_object_defgroup_name_index(ob, vgroup); if (defgrp_index != -1) { float *weights; int i; @@ -1230,12 +1230,12 @@ static float *get_weights_array(Object *ob, char *vgroup, WeightsArrayCache *cac const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT); BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, i) { dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); - weights[i] = defvert_find_weight(dvert, defgrp_index); + weights[i] = BKE_defvert_find_weight(dvert, defgrp_index); } } else { for (i = 0; i < totvert; i++, dvert++) { - weights[i] = defvert_find_weight(dvert, defgrp_index); + weights[i] = BKE_defvert_find_weight(dvert, defgrp_index); } } diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index a7033946b2e..408e870b52e 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -431,7 +431,7 @@ void calc_latt_deform(LatticeDeformData *lattice_deform_data, float co[3], float } if (lt->vgroup[0] && dvert) { - defgrp_index = defgroup_name_index(ob, lt->vgroup); + defgrp_index = BKE_object_defgroup_name_index(ob, lt->vgroup); copy_v3_v3(co_prev, co); } @@ -527,7 +527,7 @@ void calc_latt_deform(LatticeDeformData *lattice_deform_data, float co[3], float madd_v3_v3fl(co, &latticedata[idx_u * 3], u); if (defgrp_index != -1) { - weight_blend += (u * defvert_find_weight(dvert + idx_u, defgrp_index)); + weight_blend += (u * BKE_defvert_find_weight(dvert + idx_u, defgrp_index)); } } } @@ -784,8 +784,9 @@ void curve_deform_verts(Object *cuOb, if (cu->flag & CU_DEFORM_BOUNDS_OFF) { for (a = 0, dvert_iter = dvert; a < numVerts; a++, dvert_iter++) { - const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) : - defvert_find_weight(dvert_iter, defgrp_index); + const float weight = invert_vgroup ? + 1.0f - BKE_defvert_find_weight(dvert_iter, defgrp_index) : + BKE_defvert_find_weight(dvert_iter, defgrp_index); if (weight > 0.0f) { mul_m4_v3(cd.curvespace, vert_coords[a]); @@ -801,8 +802,9 @@ void curve_deform_verts(Object *cuOb, INIT_MINMAX(cd.dmin, cd.dmax); for (a = 0, dvert_iter = dvert; a < numVerts; a++, dvert_iter++) { - const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) : - defvert_find_weight(dvert_iter, defgrp_index); + const float weight = invert_vgroup ? + 1.0f - BKE_defvert_find_weight(dvert_iter, defgrp_index) : + BKE_defvert_find_weight(dvert_iter, defgrp_index); if (weight > 0.0f) { mul_m4_v3(cd.curvespace, vert_coords[a]); minmax_v3v3_v3(cd.dmin, cd.dmax, vert_coords[a]); @@ -810,8 +812,9 @@ void curve_deform_verts(Object *cuOb, } for (a = 0, dvert_iter = dvert; a < numVerts; a++, dvert_iter++) { - const float weight = invert_vgroup ? 1.0f - defvert_find_weight(dvert_iter, defgrp_index) : - defvert_find_weight(dvert_iter, defgrp_index); + const float weight = invert_vgroup ? + 1.0f - BKE_defvert_find_weight(dvert_iter, defgrp_index) : + BKE_defvert_find_weight(dvert_iter, defgrp_index); if (weight > 0.0f) { /* already in 'cd.curvespace', prev for loop */ @@ -901,8 +904,9 @@ static void lattice_deform_vert_task(void *__restrict userdata, if (data->dvert != NULL) { const float weight = data->invert_vgroup ? - 1.0f - defvert_find_weight(data->dvert + index, data->defgrp_index) : - defvert_find_weight(data->dvert + index, data->defgrp_index); + 1.0f - + BKE_defvert_find_weight(data->dvert + index, data->defgrp_index) : + BKE_defvert_find_weight(data->dvert + index, data->defgrp_index); if (weight > 0.0f) { calc_latt_deform(data->lattice_deform_data, data->vert_coords[index], weight * data->fac); } @@ -935,7 +939,7 @@ void lattice_deform_verts(Object *laOb, * We want either a Mesh/Lattice with no derived data, or derived data with deformverts. */ if (vgroup && vgroup[0] && target && ELEM(target->type, OB_MESH, OB_LATTICE)) { - defgrp_index = defgroup_name_index(target, vgroup); + defgrp_index = BKE_object_defgroup_name_index(target, vgroup); if (defgrp_index != -1) { /* if there's derived data without deformverts, don't use vgroups */ diff --git a/source/blender/blenkernel/intern/mesh_mirror.c b/source/blender/blenkernel/intern/mesh_mirror.c index 47338aef3cf..e2f298a3fb1 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.c +++ b/source/blender/blenkernel/intern/mesh_mirror.c @@ -384,16 +384,16 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis(MirrorModifierData *mmd, maxVerts; int *flip_map = NULL, flip_map_len = 0; - flip_map = defgroup_flip_map(ob, &flip_map_len, false); + flip_map = BKE_object_defgroup_flip_map(ob, &flip_map_len, false); if (flip_map) { for (i = 0; i < maxVerts; dvert++, i++) { /* merged vertices get both groups, others get flipped */ if (do_vtargetmap && (vtargetmap[i] != -1)) { - defvert_flip_merged(dvert, flip_map, flip_map_len); + BKE_defvert_flip_merged(dvert, flip_map, flip_map_len); } else { - defvert_flip(dvert, flip_map, flip_map_len); + BKE_defvert_flip(dvert, flip_map, flip_map_len); } } diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index e4de75b923f..1c9fc644341 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -803,7 +803,7 @@ bool BKE_mesh_validate_arrays(Mesh *mesh, if (dw->def_nr >= INT_MAX) { PRINT_ERR("\tVertex deform %u, has invalid group %u", i, dw->def_nr); if (do_fixes) { - defvert_remove_group(dv, dw); + BKE_defvert_remove_group(dv, dw); fix_flag.verts_weight = true; if (dv->dw) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 3fded3e5881..4ee89e4fc30 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -233,7 +233,7 @@ static void object_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const in BKE_pose_rebuild(bmain, ob_dst, ob_dst->data, do_pose_id_user); } } - defgroup_copy_list(&ob_dst->defbase, &ob_src->defbase); + BKE_defgroup_copy_list(&ob_dst->defbase, &ob_src->defbase); BKE_object_facemap_copy_list(&ob_dst->fmaps, &ob_src->fmaps); BKE_constraints_copy_ex(&ob_dst->constraints, &ob_src->constraints, flag_subdata, true); @@ -1960,7 +1960,7 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) id_us_plus((ID *)ob->data); /* ensures lib data becomes LIB_TAG_EXTERN */ /* copy vertex groups */ - defgroup_copy_list(&ob->defbase, &target->defbase); + BKE_defgroup_copy_list(&ob->defbase, &target->defbase); /* copy material and index information */ ob->actcol = ob->totcol = 0; diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c index 0ce6094771c..00be25d5210 100644 --- a/source/blender/blenkernel/intern/object_deform.c +++ b/source/blender/blenkernel/intern/object_deform.c @@ -120,7 +120,7 @@ bDeformGroup *BKE_object_defgroup_add_name(Object *ob, const char *name) return NULL; } - defgroup = BKE_defgroup_new(ob, name); + defgroup = BKE_object_defgroup_new(ob, name); ob->actdef = BLI_listbase_count(&ob->defbase); @@ -186,8 +186,8 @@ bool BKE_object_defgroup_clear(Object *ob, bDeformGroup *dg, const bool use_sele dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); if (dv && dv->dw && (!use_selection || BM_elem_flag_test(eve, BM_ELEM_SELECT))) { - MDeformWeight *dw = defvert_find_index(dv, def_nr); - defvert_remove_group(dv, dw); /* dw can be NULL */ + MDeformWeight *dw = BKE_defvert_find_index(dv, def_nr); + BKE_defvert_remove_group(dv, dw); /* dw can be NULL */ changed = true; } } @@ -203,8 +203,8 @@ bool BKE_object_defgroup_clear(Object *ob, bDeformGroup *dg, const bool use_sele for (i = 0; i < me->totvert; i++, mv++, dv++) { if (dv->dw && (!use_selection || (mv->flag & SELECT))) { - MDeformWeight *dw = defvert_find_index(dv, def_nr); - defvert_remove_group(dv, dw); /* dw can be NULL */ + MDeformWeight *dw = BKE_defvert_find_index(dv, def_nr); + BKE_defvert_remove_group(dv, dw); /* dw can be NULL */ changed = true; } } @@ -224,8 +224,8 @@ bool BKE_object_defgroup_clear(Object *ob, bDeformGroup *dg, const bool use_sele dv = <->dvert[i]; - dw = defvert_find_index(dv, def_nr); - defvert_remove_group(dv, dw); /* dw can be NULL */ + dw = BKE_defvert_find_index(dv, def_nr); + BKE_defvert_remove_group(dv, dw); /* dw can be NULL */ changed = true; } } @@ -324,8 +324,8 @@ static void object_defgroup_remove_object_mode(Object *ob, bDeformGroup *dg) for (i = 0, dv = dvert_array; i < dvert_tot; i++, dv++) { MDeformWeight *dw; - dw = defvert_find_index(dv, def_nr); - defvert_remove_group(dv, dw); /* dw can be NULL */ + dw = BKE_defvert_find_index(dv, def_nr); + BKE_defvert_remove_group(dv, dw); /* dw can be NULL */ /* inline, make into a function if anything else needs to do this */ for (j = 0; j < dv->totweight; j++) { @@ -488,7 +488,7 @@ int *BKE_object_defgroup_index_map_create(Object *ob_src, Object *ob_dst, int *r int i; for (dg_src = ob_src->defbase.first, i = 0; dg_src; dg_src = dg_src->next, i++) { - vgroup_index_map[i] = defgroup_name_index(ob_dst, dg_src->name); + vgroup_index_map[i] = BKE_object_defgroup_name_index(ob_dst, dg_src->name); is_vgroup_remap_needed = is_vgroup_remap_needed || (vgroup_index_map[i] != i); } @@ -714,7 +714,8 @@ void BKE_object_defgroup_mirror_selection(struct Object *ob, char name_flip[MAXBONENAME]; BLI_string_flip_side_name(name_flip, defgroup->name, false, sizeof(name_flip)); - i_mirr = STREQ(name_flip, defgroup->name) ? i : defgroup_name_index(ob, name_flip); + i_mirr = STREQ(name_flip, defgroup->name) ? i : + BKE_object_defgroup_name_index(ob, name_flip); if ((i_mirr >= 0 && i_mirr < defbase_tot) && (dg_flags_sel[i_mirr] == false)) { dg_flags_sel[i_mirr] = true; diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index a8e43df15a3..a77eb0b5ed6 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2223,12 +2223,12 @@ float *psys_cache_vgroup(Mesh *mesh, ParticleSystem *psys, int vgroup) vg = MEM_callocN(sizeof(float) * totvert, "vg_cache"); if (psys->vg_neg & (1 << vgroup)) { for (i = 0; i < totvert; i++) { - vg[i] = 1.0f - defvert_find_weight(&dvert[i], psys->vgroup[vgroup] - 1); + vg[i] = 1.0f - BKE_defvert_find_weight(&dvert[i], psys->vgroup[vgroup] - 1); } } else { for (i = 0; i < totvert; i++) { - vg[i] = defvert_find_weight(&dvert[i], psys->vgroup[vgroup] - 1); + vg[i] = BKE_defvert_find_weight(&dvert[i], psys->vgroup[vgroup] - 1); } } } diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index adc344c29d8..59f576e27ff 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -355,7 +355,7 @@ static void shrinkwrap_calc_nearest_vertex_cb_ex(void *__restrict userdata, float *co = calc->vertexCos[i]; float tmp_co[3]; - float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); + float weight = BKE_defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); if (calc->invert_vgroup) { weight = 1.0f - weight; @@ -527,7 +527,7 @@ static void shrinkwrap_calc_normal_projection_cb_ex(void *__restrict userdata, const float proj_limit_squared = calc->smd->projLimit * calc->smd->projLimit; float *co = calc->vertexCos[i]; float tmp_co[3], tmp_no[3]; - float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); + float weight = BKE_defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); if (calc->invert_vgroup) { weight = 1.0f - weight; @@ -1130,7 +1130,7 @@ static void shrinkwrap_calc_nearest_surface_point_cb_ex(void *__restrict userdat float *co = calc->vertexCos[i]; float tmp_co[3]; - float weight = defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); + float weight = BKE_defvert_array_find_weight_safe(calc->dvert, i, calc->vgroup); if (calc->invert_vgroup) { weight = 1.0f - weight; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 3bbd909800b..4e75f4f0761 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2700,8 +2700,9 @@ static void mesh_to_softbody(Scene *scene, Object *ob) bp = sb->bpoint; defgroup_index = me->dvert ? (sb->vertgroup - 1) : -1; - defgroup_index_mass = me->dvert ? defgroup_name_index(ob, sb->namedVG_Mass) : -1; - defgroup_index_spring = me->dvert ? defgroup_name_index(ob, sb->namedVG_Spring_K) : -1; + defgroup_index_mass = me->dvert ? BKE_object_defgroup_name_index(ob, sb->namedVG_Mass) : -1; + defgroup_index_spring = me->dvert ? BKE_object_defgroup_name_index(ob, sb->namedVG_Spring_K) : + -1; for (a = 0; a < me->totvert; a++, bp++) { /* get scalar values needed *per vertex* from vertex group functions, @@ -2714,7 +2715,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob) BLI_assert(bp->goal == sb->defgoal); } if ((ob->softflag & OB_SB_GOAL) && (defgroup_index != -1)) { - bp->goal *= defvert_find_weight(&me->dvert[a], defgroup_index); + bp->goal *= BKE_defvert_find_weight(&me->dvert[a], defgroup_index); } /* to proof the concept @@ -2722,11 +2723,11 @@ static void mesh_to_softbody(Scene *scene, Object *ob) */ if (defgroup_index_mass != -1) { - bp->mass *= defvert_find_weight(&me->dvert[a], defgroup_index_mass); + bp->mass *= BKE_defvert_find_weight(&me->dvert[a], defgroup_index_mass); } if (defgroup_index_spring != -1) { - bp->springweight *= defvert_find_weight(&me->dvert[a], defgroup_index_spring); + bp->springweight *= BKE_defvert_find_weight(&me->dvert[a], defgroup_index_spring); } } @@ -2929,8 +2930,9 @@ static void lattice_to_softbody(Scene *scene, Object *ob) bp = sb->bpoint; defgroup_index = lt->dvert ? (sb->vertgroup - 1) : -1; - defgroup_index_mass = lt->dvert ? defgroup_name_index(ob, sb->namedVG_Mass) : -1; - defgroup_index_spring = lt->dvert ? defgroup_name_index(ob, sb->namedVG_Spring_K) : -1; + defgroup_index_mass = lt->dvert ? BKE_object_defgroup_name_index(ob, sb->namedVG_Mass) : -1; + defgroup_index_spring = lt->dvert ? BKE_object_defgroup_name_index(ob, sb->namedVG_Spring_K) : + -1; /* same code used as for mesh vertices */ for (a = 0; a < totvert; a++, bp++, bpnt++) { @@ -2940,18 +2942,18 @@ static void lattice_to_softbody(Scene *scene, Object *ob) } if ((ob->softflag & OB_SB_GOAL) && (defgroup_index != -1)) { - bp->goal *= defvert_find_weight(<->dvert[a], defgroup_index); + bp->goal *= BKE_defvert_find_weight(<->dvert[a], defgroup_index); } else { bp->goal *= bpnt->weight; } if (defgroup_index_mass != -1) { - bp->mass *= defvert_find_weight(<->dvert[a], defgroup_index_mass); + bp->mass *= BKE_defvert_find_weight(<->dvert[a], defgroup_index_mass); } if (defgroup_index_spring != -1) { - bp->springweight *= defvert_find_weight(<->dvert[a], defgroup_index_spring); + bp->springweight *= BKE_defvert_find_weight(<->dvert[a], defgroup_index_spring); } } -- cgit v1.2.3