diff options
Diffstat (limited to 'source/blender/editors')
20 files changed, 128 insertions, 126 deletions
diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 4162e92cfea..0b286b4ee2b 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -256,7 +256,7 @@ void ED_armature_bone_rename(Main *bmain, } if (modifiers_usesArmature(ob, arm)) { - bDeformGroup *dg = defgroup_find_name(ob, oldname); + bDeformGroup *dg = BKE_object_defgroup_find_name(ob, oldname); if (dg) { BLI_strncpy(dg->name, newname, MAXBONENAME); } @@ -313,7 +313,7 @@ void ED_armature_bone_rename(Main *bmain, case eGpencilModifierType_Armature: { ArmatureGpencilModifierData *mmd = (ArmatureGpencilModifierData *)gp_md; if (mmd->object && mmd->object->data == arm) { - bDeformGroup *dg = defgroup_find_name(ob, oldname); + bDeformGroup *dg = BKE_object_defgroup_find_name(ob, oldname); if (dg) { BLI_strncpy(dg->name, newname, MAXBONENAME); } diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index c772590ed21..1cb1edaa080 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -121,7 +121,7 @@ static int vgroup_add_unique_bone_cb(Object *ob, Bone *bone, void *UNUSED(ptr)) * If such a vertex group already exist the routine exits. */ if (!(bone->flag & BONE_NO_DEFORM)) { - if (!defgroup_find_name(ob, bone->name)) { + if (!BKE_object_defgroup_find_name(ob, bone->name)) { BKE_object_defgroup_add_name(ob, bone->name); return 1; } @@ -175,7 +175,7 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap) } if (!data->is_weight_paint || ((arm->layer & bone->layer) && (bone->flag & BONE_SELECTED))) { - if (!(defgroup = defgroup_find_name(ob, bone->name))) { + if (!(defgroup = BKE_object_defgroup_find_name(ob, bone->name))) { defgroup = BKE_object_defgroup_add_name(ob, bone->name); } else if (defgroup->flag & DG_LOCK_WEIGHT) { @@ -401,7 +401,7 @@ static void add_verts_to_dgroups(ReportList *reports, char name_flip[MAXBONENAME]; BLI_string_flip_side_name(name_flip, dgroup->name, false, sizeof(name_flip)); - dgroupflip[j] = defgroup_find_name(ob, name_flip); + dgroupflip[j] = BKE_object_defgroup_find_name(ob, name_flip); } } diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index 9e70be323eb..c0871fd32fc 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -168,7 +168,7 @@ static int vgroup_add_unique_bone_cb(Object *ob, Bone *bone, void *UNUSED(ptr)) * If such a vertex group already exist the routine exits. */ if (!(bone->flag & BONE_NO_DEFORM)) { - if (!defgroup_find_name(ob, bone->name)) { + if (!BKE_object_defgroup_find_name(ob, bone->name)) { BKE_object_defgroup_add_name(ob, bone->name); return 1; } @@ -221,7 +221,7 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap) } if (arm->layer & bone->layer) { - if (!(defgroup = defgroup_find_name(ob, bone->name))) { + if (!(defgroup = BKE_object_defgroup_find_name(ob, bone->name))) { defgroup = BKE_object_defgroup_add_name(ob, bone->name); } else if (defgroup->flag & DG_LOCK_WEIGHT) { @@ -418,7 +418,7 @@ static void gpencil_add_verts_to_dgroups( } /* assign weight */ - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = weight; } diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index c2f1e9f091a..0c3e3294428 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -988,7 +988,7 @@ static bool gp_brush_weight_apply(tGP_BrushEditData *gso, } } /* get current weight */ - MDeformWeight *dw = defvert_verify_index(dvert, gso->vrgroup); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, gso->vrgroup); float curweight = dw ? dw->weight : 0.0f; if (gp_brush_invert_check(gso)) { diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 0c57e9560bc..a8c3fb02e11 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -1846,12 +1846,12 @@ static int gpencil_vertex_group_invert_exec(bContext *C, wmOperator *op) 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_add_index_notest(dvert, def_nr, 1.0f); + BKE_defvert_add_index_notest(dvert, def_nr, 1.0f); } else if (dw->weight == 1.0f) { - defvert_remove_group(dvert, dw); + BKE_defvert_remove_group(dvert, dw); } else { dw->weight = 1.0f - dw->weight; @@ -1938,8 +1938,8 @@ static int gpencil_vertex_group_smooth_exec(bContext *C, wmOperator *op) ptc = &gps->points[i]; } - float wa = defvert_find_weight(dverta, def_nr); - float wb = defvert_find_weight(dvertb, def_nr); + float wa = BKE_defvert_find_weight(dverta, def_nr); + float wb = BKE_defvert_find_weight(dvertb, def_nr); /* the optimal value is the corresponding to the interpolation of the weight * at the distance of point b @@ -1947,7 +1947,7 @@ static int gpencil_vertex_group_smooth_exec(bContext *C, wmOperator *op) const float opfac = line_point_factor_v3(&ptb->x, &pta->x, &ptc->x); const float optimal = interpf(wa, wb, opfac); /* Based on influence factor, blend between original and optimal */ - MDeformWeight *dw = defvert_verify_index(dvertb, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvertb, def_nr); if (dw) { dw->weight = interpf(wb, optimal, fac); CLAMP(dw->weight, 0.0, 1.0f); @@ -2016,7 +2016,7 @@ static int gpencil_vertex_group_normalize_exec(bContext *C, wmOperator *op) float maxvalue = 0.0f; for (int i = 0; i < gps->totpoints; i++) { dvert = &gps->dvert[i]; - dw = defvert_find_index(dvert, def_nr); + dw = BKE_defvert_find_index(dvert, def_nr); if ((dw != NULL) && (dw->weight > maxvalue)) { maxvalue = dw->weight; } @@ -2026,7 +2026,7 @@ static int gpencil_vertex_group_normalize_exec(bContext *C, wmOperator *op) if (maxvalue > 0.0f) { for (int i = 0; i < gps->totpoints; i++) { dvert = &gps->dvert[i]; - dw = defvert_find_index(dvert, def_nr); + dw = BKE_defvert_find_index(dvert, def_nr); if (dw != NULL) { dw->weight = dw->weight / maxvalue; } @@ -2102,7 +2102,7 @@ static int gpencil_vertex_group_normalize_all_exec(bContext *C, wmOperator *op) continue; } - dw = defvert_find_index(dvert, v); + dw = BKE_defvert_find_index(dvert, v); if (dw != NULL) { tot_values[i] += dw->weight; } @@ -2128,7 +2128,7 @@ static int gpencil_vertex_group_normalize_all_exec(bContext *C, wmOperator *op) continue; } - dw = defvert_find_index(dvert, v); + dw = BKE_defvert_find_index(dvert, v); if (dw != NULL) { dw->weight = dw->weight / tot_values[i]; } @@ -2320,7 +2320,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op) for (bDeformGroup *dg = ob_iter->defbase.first; dg; dg = dg->next) { bDeformGroup *vgroup = MEM_dupallocN(dg); int idx = BLI_listbase_count(&ob_active->defbase); - defgroup_unique_name(vgroup, ob_active); + BKE_object_defgroup_unique_name(vgroup, ob_active); BLI_addtail(&ob_active->defbase, vgroup); /* update vertex groups in strokes in original data */ for (bGPDlayer *gpl_src = gpd->layers.first; gpl_src; gpl_src = gpl_src->next) { diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 3feec7a5801..44ff11aa84a 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -1092,7 +1092,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf) pt->time = 0.0f; if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 92d69ecec41..cad31ed18e5 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1049,7 +1049,7 @@ static short gp_stroke_addpoint( if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { BKE_gpencil_dvert_ensure(gps); - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } @@ -1202,7 +1202,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p) if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { BKE_gpencil_dvert_ensure(gps); - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } @@ -1231,7 +1231,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p) if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { BKE_gpencil_dvert_ensure(gps); - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } @@ -1279,7 +1279,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p) if ((ts->gpencil_flags & GP_TOOL_FLAG_CREATE_WEIGHTS) && (have_weight)) { BKE_gpencil_dvert_ensure(gps); - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } @@ -1479,7 +1479,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p) BKE_gpencil_dvert_ensure(gps); for (i = 0; i < gps->totpoints; i++) { MDeformVert *ve = &gps->dvert[i]; - MDeformWeight *dw = defvert_verify_index(ve, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(ve, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 6a0006ef04c..77f2f5b7353 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -1334,7 +1334,7 @@ static void gpencil_primitive_interaction_end(bContext *C, BKE_gpencil_dvert_ensure(gps); for (int i = 0; i < gps->totpoints; i++) { MDeformVert *ve = &gps->dvert[i]; - MDeformWeight *dw = defvert_verify_index(ve, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(ve, def_nr); if (dw) { dw->weight = ts->vgroup_weight; } diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 413aa6c7394..d4eb157bf3c 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -1489,7 +1489,7 @@ void ED_gpencil_vgroup_assign(bContext *C, Object *ob, float weight) bGPDspoint *pt = &gps->points[i]; MDeformVert *dvert = &gps->dvert[i]; if (pt->flag & GP_SPOINT_SELECT) { - MDeformWeight *dw = defvert_verify_index(dvert, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert, def_nr); if (dw) { dw->weight = weight; } @@ -1543,9 +1543,9 @@ void ED_gpencil_vgroup_remove(bContext *C, Object *ob) MDeformVert *dvert = &gps->dvert[i]; if ((pt->flag & GP_SPOINT_SELECT) && (dvert->totweight > 0)) { - 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); } } } @@ -1595,7 +1595,7 @@ void ED_gpencil_vgroup_select(bContext *C, Object *ob) } MDeformVert *dvert = &gps->dvert[i]; - if (defvert_find_index(dvert, def_nr) != NULL) { + if (BKE_defvert_find_index(dvert, def_nr) != NULL) { pt->flag |= GP_SPOINT_SELECT; gps->flag |= GP_STROKE_SELECT; } @@ -1646,7 +1646,7 @@ void ED_gpencil_vgroup_deselect(bContext *C, Object *ob) } MDeformVert *dvert = &gps->dvert[i]; - if (defvert_find_index(dvert, def_nr) != NULL) { + if (BKE_defvert_find_index(dvert, def_nr) != NULL) { pt->flag &= ~GP_SPOINT_SELECT; } } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 71f045bd265..91ffe0ce05c 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -5250,7 +5250,7 @@ static int edbm_decimate_exec(bContext *C, wmOperator *op) if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { if (use_vertex_group) { const MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(v, cd_dvert_offset); - weight = defvert_find_weight(dv, defbase_act); + weight = BKE_defvert_find_weight(dv, defbase_act); if (invert_vertex_group) { weight = 1.0f - weight; } diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 08d7ee4d67c..3ba8780c18a 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -429,7 +429,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) /* Join this object's vertex groups to the base one's */ for (dg = ob_iter->defbase.first; dg; dg = dg->next) { /* See if this group exists in the object (if it doesn't, add it to the end) */ - if (!defgroup_find_name(ob, dg->name)) { + if (!BKE_object_defgroup_find_name(ob, dg->name)) { odg = MEM_mallocN(sizeof(bDeformGroup), "join deformGroup"); memcpy(odg, dg, sizeof(bDeformGroup)); BLI_addtail(&ob->defbase, odg); diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index bcbf7ddf9a6..3c722ffc749 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -123,7 +123,7 @@ static bool return_editmesh_vgroup(Object *obedit, BMEditMesh *em, char *r_name, BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); - if (defvert_find_weight(dvert, defgrp_index) > 0.0f) { + if (BKE_defvert_find_weight(dvert, defgrp_index) > 0.0f) { add_v3_v3(r_cent, eve->co); totvert++; } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 17cc266b9c8..c11b3aebe72 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -105,7 +105,7 @@ bool ED_vgroup_sync_from_pose(Object *ob) if (armobj && (armobj->mode & OB_MODE_POSE)) { struct bArmature *arm = armobj->data; if (arm->act_bone) { - int def_num = defgroup_name_index(ob, arm->act_bone->name); + int def_num = BKE_object_defgroup_name_index(ob, arm->act_bone->name); if (def_num != -1) { ob->actdef = def_num + 1; return true; @@ -130,7 +130,7 @@ void ED_vgroup_data_clamp_range(ID *id, const int total) int j; for (j = 0; j < dv->totweight; j++) { if (dv->dw[j].def_nr >= total) { - defvert_remove_group(dv, &dv->dw[j]); + BKE_defvert_remove_group(dv, &dv->dw[j]); j--; } } @@ -271,7 +271,7 @@ void ED_vgroup_parray_mirror_sync(Object *ob, } int flip_map_len; - const int *flip_map = defgroup_flip_map(ob, &flip_map_len, true); + const int *flip_map = BKE_object_defgroup_flip_map(ob, &flip_map_len, true); for (int i_src = 0; i_src < dvert_tot; i_src++) { if (dvert_array[i_src] != NULL) { @@ -282,7 +282,8 @@ void ED_vgroup_parray_mirror_sync(Object *ob, const MDeformVert *dv_src = dvert_array[i_src]; MDeformVert *dv_dst = dvert_array_all[i_dst]; - defvert_mirror_subset(dv_dst, dv_src, vgroup_validmap, vgroup_tot, flip_map, flip_map_len); + BKE_defvert_mirror_subset( + dv_dst, dv_src, vgroup_validmap, vgroup_tot, flip_map, flip_map_len); dvert_array[i_dst] = dvert_array_all[i_dst]; } @@ -359,7 +360,7 @@ void ED_vgroup_parray_remove_zero(MDeformVert **dvert_array, dw = dv->dw + j; if ((dw->def_nr < vgroup_tot) && vgroup_validmap[dw->def_nr]) { if (dw->weight <= epsilon) { - defvert_remove_group(dv, dw); + BKE_defvert_remove_group(dv, dw); } } } @@ -461,7 +462,7 @@ void ED_vgroup_parray_to_weight_array(const MDeformVert **dvert_array, for (i = 0; i < dvert_tot; i++) { const MDeformVert *dv = dvert_array[i]; - dvert_weights[i] = dv ? defvert_find_weight(dv, def_nr) : 0.0f; + dvert_weights[i] = dv ? BKE_defvert_find_weight(dv, def_nr) : 0.0f; } } @@ -477,15 +478,15 @@ void ED_vgroup_parray_from_weight_array(MDeformVert **dvert_array, MDeformVert *dv = dvert_array[i]; if (dv) { if (dvert_weights[i] > 0.0f) { - MDeformWeight *dw = defvert_verify_index(dv, def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dv, def_nr); BLI_assert(IN_RANGE_INCL(dvert_weights[i], 0.0f, 1.0f)); dw->weight = dvert_weights[i]; } else { - MDeformWeight *dw = defvert_find_index(dv, def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dv, def_nr); if (dw) { if (remove_zero) { - defvert_remove_group(dv, dw); + BKE_defvert_remove_group(dv, dw); } else { dw->weight = 0.0f; @@ -505,15 +506,16 @@ static void mesh_defvert_mirror_update_internal(Object *ob, if (def_nr == -1) { /* all vgroups, add groups where needed */ int flip_map_len; - int *flip_map = defgroup_flip_map(ob, &flip_map_len, true); - defvert_sync_mapped(dvert_dst, dvert_src, flip_map, flip_map_len, true); + int *flip_map = BKE_object_defgroup_flip_map(ob, &flip_map_len, true); + BKE_defvert_sync_mapped(dvert_dst, dvert_src, flip_map, flip_map_len, true); MEM_freeN(flip_map); } else { /* single vgroup */ - MDeformWeight *dw = defvert_verify_index(dvert_dst, defgroup_flip_index(ob, def_nr, 1)); + MDeformWeight *dw = BKE_defvert_ensure_index(dvert_dst, + BKE_object_defgroup_flip_index(ob, def_nr, 1)); if (dw) { - dw->weight = defvert_find_weight(dvert_src, def_nr); + dw->weight = BKE_defvert_find_weight(dvert_src, def_nr); } } } @@ -589,8 +591,8 @@ static void vgroup_remove_weight(Object *ob, const int def_nr) dvert_act = ED_mesh_active_dvert_get_only(ob); - dw = defvert_find_index(dvert_act, def_nr); - defvert_remove_group(dvert_act, dw); + dw = BKE_defvert_find_index(dvert_act, def_nr); + BKE_defvert_remove_group(dvert_act, dw); } static bool vgroup_normalize_active_vertex(Object *ob, eVGroupSelect subset_type) @@ -616,7 +618,7 @@ static bool vgroup_normalize_active_vertex(Object *ob, eVGroupSelect subset_type vgroup_validmap = BKE_object_defgroup_subset_from_select_type( ob, subset_type, &vgroup_tot, &subset_count); - defvert_normalize_subset(dvert_act, vgroup_validmap, vgroup_tot); + BKE_defvert_normalize_subset(dvert_act, vgroup_validmap, vgroup_tot); MEM_freeN((void *)vgroup_validmap); if (me->editflag & ME_EDIT_MIRROR_X) { @@ -651,7 +653,7 @@ static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type) BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, i) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && eve != eve_act) { MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); - defvert_copy_subset(dv, dvert_act, vgroup_validmap, vgroup_tot); + BKE_defvert_copy_subset(dv, dvert_act, vgroup_validmap, vgroup_tot); if (me->editflag & ME_EDIT_MIRROR_X) { ED_mesh_defvert_mirror_update_em(ob, eve, -1, i, cd_dvert_offset); } @@ -668,7 +670,7 @@ static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type) dv = me->dvert; for (i = 0; i < me->totvert; i++, dv++) { if ((me->mvert[i].flag & SELECT) && dv != dvert_act) { - defvert_copy_subset(dv, dvert_act, vgroup_validmap, vgroup_tot); + BKE_defvert_copy_subset(dv, dvert_act, vgroup_validmap, vgroup_tot); if (me->editflag & ME_EDIT_MIRROR_X) { ED_mesh_defvert_mirror_update_ob(ob, -1, i); } @@ -804,7 +806,7 @@ static void ED_vgroup_nr_vert_add( MDeformWeight *dw; /* Lets first check to see if this vert is already in the weight group - if so lets update it. */ - dw = defvert_find_index(dv, def_nr); + dw = BKE_defvert_find_index(dv, def_nr); if (dw) { switch (assignmode) { @@ -821,7 +823,7 @@ static void ED_vgroup_nr_vert_add( dw->weight -= weight; /* If the weight is zero or less than remove the vert from the deform group. */ if (dw->weight <= 0.0f) { - defvert_remove_group(dv, dw); + BKE_defvert_remove_group(dv, dw); } break; } @@ -839,7 +841,7 @@ static void ED_vgroup_nr_vert_add( /* If we are doing an additive assignment, then we need to create the deform weight. */ /* We checked if the vertex was added before so no need to test again, simply add. */ - defvert_add_index_notest(dv, def_nr, weight); + BKE_defvert_add_index_notest(dv, def_nr, weight); break; } } @@ -897,8 +899,8 @@ void ED_vgroup_vert_remove(Object *ob, bDeformGroup *dg, int vertnum) MDeformVert *dv = &dvert[vertnum]; 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 */ } } } @@ -947,7 +949,7 @@ static float get_vert_def_nr(Object *ob, const int def_nr, const int vertnum) } if (dv) { - MDeformWeight *dw = defvert_find_index(dv, def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dv, def_nr); if (dw) { return dw->weight; } @@ -971,7 +973,7 @@ void ED_vgroup_select_by_name(Object *ob, const char *name) { /* note: ob->actdef==0 signals on painting to create a new one, * if a bone in posemode is selected */ - ob->actdef = defgroup_name_index(ob, name) + 1; + ob->actdef = BKE_object_defgroup_name_index(ob, name) + 1; } /********************** Operator Implementations *********************/ @@ -999,7 +1001,7 @@ static void vgroup_select_verts(Object *ob, int select) BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { if (!BM_elem_flag_test(eve, BM_ELEM_HIDDEN)) { MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); - if (defvert_find_index(dv, def_nr)) { + if (BKE_defvert_find_index(dv, def_nr)) { BM_vert_select_set(em->bm, eve, select); } } @@ -1025,7 +1027,7 @@ static void vgroup_select_verts(Object *ob, int select) for (i = 0; i < me->totvert; i++, mv++, dv++) { if (!(mv->flag & ME_HIDE)) { - if (defvert_find_index(dv, def_nr)) { + if (BKE_defvert_find_index(dv, def_nr)) { if (select) { mv->flag |= SELECT; } @@ -1052,7 +1054,7 @@ static void vgroup_select_verts(Object *ob, int select) tot = lt->pntsu * lt->pntsv * lt->pntsw; for (a = 0, bp = lt->def; a < tot; a++, bp++, dv++) { - if (defvert_find_index(dv, def_nr)) { + if (BKE_defvert_find_index(dv, def_nr)) { if (select) { bp->f1 |= SELECT; } @@ -1088,9 +1090,9 @@ static void vgroup_duplicate(Object *ob) BLI_strncpy(name, dg->name, sizeof(name)); } - cdg = defgroup_duplicate(dg); + cdg = BKE_defgroup_duplicate(dg); BLI_strncpy(cdg->name, name, sizeof(cdg->name)); - defgroup_unique_name(cdg, ob); + BKE_object_defgroup_unique_name(cdg, ob); BLI_addtail(&ob->defbase, cdg); @@ -1104,11 +1106,11 @@ static void vgroup_duplicate(Object *ob) if (dvert_array) { for (i = 0; i < dvert_tot; i++) { MDeformVert *dv = dvert_array[i]; - dw_org = defvert_find_index(dv, idg); + dw_org = BKE_defvert_find_index(dv, idg); if (dw_org) { - /* defvert_verify_index re-allocs org so need to store the weight first */ + /* BKE_defvert_ensure_index re-allocs org so need to store the weight first */ const float weight = dw_org->weight; - dw_cpy = defvert_verify_index(dv, icdg); + dw_cpy = BKE_defvert_ensure_index(dv, icdg); dw_cpy->weight = weight; } } @@ -1142,7 +1144,7 @@ static bool vgroup_normalize(Object *ob) continue; } - dw = defvert_find_index(dv, def_nr); + dw = BKE_defvert_find_index(dv, def_nr); if (dw) { weight_max = max_ff(dw->weight, weight_max); } @@ -1156,7 +1158,7 @@ static bool vgroup_normalize(Object *ob) continue; } - dw = defvert_find_index(dv, def_nr); + dw = BKE_defvert_find_index(dv, def_nr); if (dw) { dw->weight /= weight_max; @@ -1579,7 +1581,7 @@ static void vgroup_levels_subset(Object *ob, j = vgroup_tot; while (j--) { if (vgroup_validmap[j]) { - dw = defvert_find_index(dv, j); + dw = BKE_defvert_find_index(dv, j); if (dw) { dw->weight = gain * (dw->weight + offset); @@ -1643,13 +1645,13 @@ static bool vgroup_normalize_all(Object *ob, /* in case its not selected */ if ((dv = dvert_array[i])) { if (lock_flags) { - defvert_normalize_lock_map(dv, vgroup_validmap, vgroup_tot, lock_flags, defbase_tot); + BKE_defvert_normalize_lock_map(dv, vgroup_validmap, vgroup_tot, lock_flags, defbase_tot); } else if (lock_active) { - defvert_normalize_lock_single(dv, vgroup_validmap, vgroup_tot, def_nr); + BKE_defvert_normalize_lock_single(dv, vgroup_validmap, vgroup_tot, def_nr); } else { - defvert_normalize_subset(dv, vgroup_validmap, vgroup_tot); + BKE_defvert_normalize_subset(dv, vgroup_validmap, vgroup_tot); } } } @@ -1833,10 +1835,10 @@ static void vgroup_invert_subset(Object *ob, if (vgroup_validmap[j]) { if (auto_assign) { - dw = defvert_verify_index(dv, j); + dw = BKE_defvert_ensure_index(dv, j); } else { - dw = defvert_find_index(dv, j); + dw = BKE_defvert_find_index(dv, j); } if (dw) { @@ -2274,28 +2276,28 @@ static void dvert_mirror_op(MDeformVert *dvert, SWAP(MDeformVert, *dvert, *dvert_mirr); } else { - MDeformWeight *dw = defvert_find_index(dvert, act_vgroup); - MDeformWeight *dw_mirr = defvert_find_index(dvert_mirr, act_vgroup); + MDeformWeight *dw = BKE_defvert_find_index(dvert, act_vgroup); + MDeformWeight *dw_mirr = BKE_defvert_find_index(dvert_mirr, act_vgroup); if (dw && dw_mirr) { SWAP(float, dw->weight, dw_mirr->weight); } else if (dw) { - dw_mirr = defvert_verify_index(dvert_mirr, act_vgroup); + dw_mirr = BKE_defvert_ensure_index(dvert_mirr, act_vgroup); dw_mirr->weight = dw->weight; - defvert_remove_group(dvert, dw); + BKE_defvert_remove_group(dvert, dw); } else if (dw_mirr) { - dw = defvert_verify_index(dvert, act_vgroup); + dw = BKE_defvert_ensure_index(dvert, act_vgroup); dw->weight = dw_mirr->weight; - defvert_remove_group(dvert_mirr, dw_mirr); + BKE_defvert_remove_group(dvert_mirr, dw_mirr); } } } if (flip_vgroups) { - defvert_flip(dvert, flip_map, flip_map_len); - defvert_flip(dvert_mirr, flip_map, flip_map_len); + BKE_defvert_flip(dvert, flip_map, flip_map_len); + BKE_defvert_flip(dvert_mirr, flip_map, flip_map_len); } } else { @@ -2306,16 +2308,16 @@ static void dvert_mirror_op(MDeformVert *dvert, if (mirror_weights) { if (all_vgroups) { - defvert_copy(dvert, dvert_mirr); + BKE_defvert_copy(dvert, dvert_mirr); } else { - defvert_copy_index(dvert, act_vgroup, dvert_mirr, act_vgroup); + BKE_defvert_copy_index(dvert, act_vgroup, dvert_mirr, act_vgroup); } } /* flip map already modified for 'all_vgroups' */ if (flip_vgroups) { - defvert_flip(dvert, flip_map, flip_map_len); + BKE_defvert_flip(dvert, flip_map, flip_map_len); } } } @@ -2358,8 +2360,8 @@ void ED_vgroup_mirror(Object *ob, } if (flip_vgroups) { - flip_map = all_vgroups ? defgroup_flip_map(ob, &flip_map_len, false) : - defgroup_flip_map_single(ob, &flip_map_len, false, def_nr); + flip_map = all_vgroups ? BKE_object_defgroup_flip_map(ob, &flip_map_len, false) : + BKE_object_defgroup_flip_map_single(ob, &flip_map_len, false, def_nr); BLI_assert(flip_map != NULL); @@ -2576,7 +2578,7 @@ static void vgroup_assign_verts(Object *ob, const float weight) MDeformVert *dv; MDeformWeight *dw; dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); /* can be NULL */ - dw = defvert_verify_index(dv, def_nr); + dw = BKE_defvert_ensure_index(dv, def_nr); if (dw) { dw->weight = weight; } @@ -2598,7 +2600,7 @@ static void vgroup_assign_verts(Object *ob, const float weight) for (i = 0; i < me->totvert; i++, mv++, dv++) { if (mv->flag & SELECT) { MDeformWeight *dw; - dw = defvert_verify_index(dv, def_nr); + dw = BKE_defvert_ensure_index(dv, def_nr); if (dw) { dw->weight = weight; } @@ -2623,7 +2625,7 @@ static void vgroup_assign_verts(Object *ob, const float weight) if (bp->f1 & SELECT) { MDeformWeight *dw; - dw = defvert_verify_index(dv, def_nr); + dw = BKE_defvert_ensure_index(dv, def_nr); if (dw) { dw->weight = weight; } @@ -3885,7 +3887,7 @@ static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op) BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) { dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); if (dvert->totweight) { - defvert_remap(dvert, sort_map, defbase_tot); + BKE_defvert_remap(dvert, sort_map, defbase_tot); } } } @@ -3905,7 +3907,7 @@ static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op) if (dvert) { while (dvert_tot--) { if (dvert->totweight) { - defvert_remap(dvert, sort_map, defbase_tot); + BKE_defvert_remap(dvert, sort_map, defbase_tot); } dvert++; } @@ -3953,7 +3955,7 @@ static void vgroup_sort_bone_hierarchy(Object *ob, ListBase *bonebase) if (bonebase != NULL) { Bone *bone; for (bone = bonebase->last; bone; bone = bone->prev) { - bDeformGroup *dg = defgroup_find_name(ob, bone->name); + bDeformGroup *dg = BKE_object_defgroup_find_name(ob, bone->name); vgroup_sort_bone_hierarchy(ob, &bone->childbase); if (dg != NULL) { @@ -4105,12 +4107,12 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) if (dvert_act == NULL) { return; } - weight_act = defvert_find_weight(dvert_act, def_nr); + weight_act = BKE_defvert_find_weight(dvert_act, def_nr); BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, i) { if (BM_elem_flag_test(eve, BM_ELEM_SELECT) && (eve != eve_act)) { MDeformVert *dv = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset); - MDeformWeight *dw = defvert_find_index(dv, def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dv, def_nr); if (dw) { dw->weight = weight_act; @@ -4133,12 +4135,12 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr) if (dvert_act == NULL) { return; } - weight_act = defvert_find_weight(dvert_act, def_nr); + weight_act = BKE_defvert_find_weight(dvert_act, def_nr); dv = me->dvert; for (i = 0; i < me->totvert; i++, dv++) { if ((me->mvert[i].flag & SELECT) && (dv != dvert_act)) { - MDeformWeight *dw = defvert_find_index(dv, def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dv, def_nr); if (dw) { dw->weight = weight_act; if (me->editflag & ME_EDIT_MIRROR_X) { diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index c06c21b9057..b0dbe5d9a3e 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -259,7 +259,7 @@ static int output_toggle_exec(bContext *C, wmOperator *op) DEG_relations_tag_update(CTX_data_main(C)); } else { - bDeformGroup *defgroup = defgroup_find_name(ob, name); + bDeformGroup *defgroup = BKE_object_defgroup_find_name(ob, name); if (defgroup) { BKE_object_defgroup_remove(ob, defgroup); DEG_relations_tag_update(CTX_data_main(C)); 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); } } diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c index 266c130d12a..3a4c8f20028 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c @@ -160,7 +160,7 @@ static bool vertex_paint_from_weight(Object *ob) uint j = 0; do { uint vidx = me->mloop[mp->loopstart + j].v; - const float weight = defvert_find_weight(&me->dvert[vidx], vgroup_active); + const float weight = BKE_defvert_find_weight(&me->dvert[vidx], vgroup_active); const uchar grayscale = weight * 255; lcol->r = grayscale; lcol->b = grayscale; diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index ae4ef59597b..0d4fcd3e87d 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -211,7 +211,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, const wmEvent *even ToolSettings *ts = vc.scene->toolsettings; Brush *brush = BKE_paint_brush(&ts->wpaint->paint); const int vgroup_active = vc.obact->actdef - 1; - float vgroup_weight = defvert_find_weight(&me->dvert[v_idx_best], vgroup_active); + float vgroup_weight = BKE_defvert_find_weight(&me->dvert[v_idx_best], vgroup_active); /* use combined weight in multipaint mode, * since that's what is displayed to the user in the colors */ @@ -462,9 +462,9 @@ static bool weight_paint_set(Object *ob, float paintweight) continue; } - dw = defvert_verify_index(&me->dvert[vidx], vgroup_active); + dw = BKE_defvert_ensure_index(&me->dvert[vidx], vgroup_active); if (dw) { - dw_prev = defvert_verify_index(wpp.wpaint_prev + vidx, vgroup_active); + dw_prev = BKE_defvert_ensure_index(wpp.wpaint_prev + vidx, vgroup_active); dw_prev->weight = dw->weight; /* set the undo weight */ dw->weight = paintweight; @@ -473,12 +473,12 @@ static bool weight_paint_set(Object *ob, float paintweight) if (j >= 0) { /* copy, not paint again */ if (vgroup_mirror != -1) { - dw = defvert_verify_index(me->dvert + j, vgroup_mirror); - dw_prev = defvert_verify_index(wpp.wpaint_prev + j, vgroup_mirror); + dw = BKE_defvert_ensure_index(me->dvert + j, vgroup_mirror); + dw_prev = BKE_defvert_ensure_index(wpp.wpaint_prev + j, vgroup_mirror); } else { - dw = defvert_verify_index(me->dvert + j, vgroup_active); - dw_prev = defvert_verify_index(wpp.wpaint_prev + j, vgroup_active); + dw = BKE_defvert_ensure_index(me->dvert + j, vgroup_active); + dw_prev = BKE_defvert_ensure_index(wpp.wpaint_prev + j, vgroup_active); } dw_prev->weight = dw->weight; /* set the undo weight */ dw->weight = paintweight; @@ -602,7 +602,7 @@ static void gradientVert_update(WPGradient_userData *grad_data, int index) if (alpha != 0.0f) { MDeformVert *dv = &me->dvert[index]; - MDeformWeight *dw = defvert_verify_index(dv, grad_data->def_nr); + MDeformWeight *dw = BKE_defvert_ensure_index(dv, grad_data->def_nr); // dw->weight = alpha; // testing int tool = grad_data->brush->blend; float testw; @@ -617,14 +617,14 @@ static void gradientVert_update(WPGradient_userData *grad_data, int index) MDeformVert *dv = &me->dvert[index]; if (vs->flag & VGRAD_STORE_DW_EXIST) { /* normally we NULL check, but in this case we know it exists */ - MDeformWeight *dw = defvert_find_index(dv, grad_data->def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dv, grad_data->def_nr); dw->weight = vs->weight_orig; } else { /* wasn't originally existing, remove */ - MDeformWeight *dw = defvert_find_index(dv, grad_data->def_nr); + MDeformWeight *dw = BKE_defvert_find_index(dv, grad_data->def_nr); if (dw) { - defvert_remove_group(dv, dw); + BKE_defvert_remove_group(dv, dw); } } } @@ -678,7 +678,7 @@ static void gradientVertInit__mapFunc(void *userData, } MDeformVert *dv = &me->dvert[index]; - const MDeformWeight *dw = defvert_find_index(dv, grad_data->def_nr); + const MDeformWeight *dw = BKE_defvert_find_index(dv, grad_data->def_nr); if (dw) { vs->weight_orig = dw->weight; vs->flag = VGRAD_STORE_DW_EXIST; diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c index 28699b45add..517bb6324be 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c @@ -88,7 +88,7 @@ bool ED_wpaint_ensure_data(bContext *C, bPoseChannel *pchan = BKE_pose_channel_find_name(modob->pose, actbone->name); if (pchan) { - bDeformGroup *dg = defgroup_find_name(ob, pchan->name); + bDeformGroup *dg = BKE_object_defgroup_find_name(ob, pchan->name); if (dg == NULL) { dg = BKE_object_defgroup_add_name(ob, pchan->name); /* sets actdef */ DEG_relations_tag_update(CTX_data_main(C)); @@ -140,9 +140,9 @@ int ED_wpaint_mirror_vgroup_ensure(Object *ob, const int vgroup_active) char name_flip[MAXBONENAME]; BLI_string_flip_side_name(name_flip, defgroup->name, false, sizeof(name_flip)); - mirrdef = defgroup_name_index(ob, name_flip); + mirrdef = BKE_object_defgroup_name_index(ob, name_flip); if (mirrdef == -1) { - if (BKE_defgroup_new(ob, name_flip)) { + if (BKE_object_defgroup_new(ob, name_flip)) { mirrdef = BLI_listbase_count(&ob->defbase) - 1; } } diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index cc1222aa47b..8985f32d23e 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -741,7 +741,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) else { switch (tselem->type) { case TSE_DEFGROUP: - defgroup_unique_name(te->directdata, (Object *)tselem->id); // id = object + BKE_object_defgroup_unique_name(te->directdata, (Object *)tselem->id); // id = object break; case TSE_NLA_ACTION: BLI_libblock_ensure_unique_name(bmain, tselem->id->name); diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 9ab56dba72d..9b02ea7238c 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1184,7 +1184,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa) for (i = 0, dg = ob->defbase.first; dg; i++, dg = dg->next) { bool locked = (dg->flag & DG_LOCK_WEIGHT) != 0; if (vgroup_validmap[i]) { - MDeformWeight *dw = defvert_find_index(dv, i); + MDeformWeight *dw = BKE_defvert_find_index(dv, i); if (dw) { int x, xco = 0; int icon; |