diff options
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_intern.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_naming.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 16 | ||||
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 9a04425a083..438bb8e447b 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -228,14 +228,14 @@ EditBone *make_boneList(struct ListBase *edbo, struct ListBase *bones, struct Bo /* duplicate method */ void preEditBoneDuplicate(struct ListBase *editbones); void postEditBoneDuplicate(struct ListBase *editbones, struct Object *ob); -struct EditBone *duplicateEditBone(struct EditBone *curBone, +struct EditBone *duplicateEditBone(struct EditBone *cur_bone, const char *name, struct ListBase *editbones, struct Object *ob); /* duplicate method (cross objects) */ /* editbones is the target list */ -struct EditBone *duplicateEditBoneObjects(struct EditBone *curBone, +struct EditBone *duplicateEditBoneObjects(struct EditBone *cur_bone, const char *name, struct ListBase *editbones, struct Object *src_ob, diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 544d86d4c47..60a1434ed42 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -81,13 +81,13 @@ static bool editbone_unique_check(void *arg, const char *name) } /* If bone is already in list, pass it as param to ignore it. */ -void ED_armature_ebone_unique_name(ListBase *edbo, char *name, EditBone *bone) +void ED_armature_ebone_unique_name(ListBase *ebones, char *name, EditBone *bone) { struct { ListBase *lb; void *bone; } data; - data.lb = edbo; + data.lb = ebones; data.bone = bone; BLI_uniquename_cb(editbone_unique_check, &data, DATA_("Bone"), '.', name, sizeof(bone->name)); diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index ceacd3333d5..1534ea3287f 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -651,13 +651,13 @@ static float heat_limit_weight(float weight) void heat_bone_weighting(Object *ob, Mesh *me, float (*verts)[3], - int numsource, + int numbones, bDeformGroup **dgrouplist, bDeformGroup **dgroupflip, float (*root)[3], float (*tip)[3], const int *selected, - const char **err_str) + const char **error_str) { LaplacianSystem *sys; MLoopTri *mlooptri; @@ -672,7 +672,7 @@ void heat_bone_weighting(Object *ob, bool use_vert_sel = (me->editflag & ME_EDIT_PAINT_VERT_SEL) != 0; bool use_face_sel = (me->editflag & ME_EDIT_PAINT_FACE_SEL) != 0; - *err_str = NULL; + *error_str = NULL; /* bone heat needs triangulated faces */ tottri = poly_to_tri_count(me->totpoly, me->totloop); @@ -714,7 +714,7 @@ void heat_bone_weighting(Object *ob, sys->heat.verts = verts; sys->heat.root = root; sys->heat.tip = tip; - sys->heat.numsource = numsource; + sys->heat.numsource = numbones; heat_ray_tree_create(sys); heat_laplacian_create(sys); @@ -729,13 +729,13 @@ void heat_bone_weighting(Object *ob, } /* compute weights per bone */ - for (j = 0; j < numsource; j++) { + for (j = 0; j < numbones; j++) { if (!selected[j]) { continue; } firstsegment = (j == 0 || dgrouplist[j - 1] != dgrouplist[j]); - lastsegment = (j == numsource - 1 || dgrouplist[j] != dgrouplist[j + 1]); + lastsegment = (j == numbones - 1 || dgrouplist[j] != dgrouplist[j + 1]); bbone = !(firstsegment && lastsegment); /* clear weights */ @@ -805,8 +805,8 @@ void heat_bone_weighting(Object *ob, } } } - else if (*err_str == NULL) { - *err_str = N_("Bone Heat Weighting: failed to find solution for one or more bones"); + else if (*error_str == NULL) { + *error_str = N_("Bone Heat Weighting: failed to find solution for one or more bones"); break; } diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index 0405e361b2f..7e7b64c7510 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -56,7 +56,7 @@ void heat_bone_weighting(struct Object *ob, float (*root)[3], float (*tip)[3], const int *selected, - const char **error); + const char **error_str); #ifdef RIGID_DEFORM /* As-Rigid-As-Possible Deformation */ |