From e62cdbb474c4a09b55f046b199d3036534fd259c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Nov 2013 04:20:31 +1100 Subject: code cleanup: rename flip_side_name to BKE_deform_flip_side_name --- source/blender/blenkernel/BKE_deform.h | 3 ++- source/blender/blenkernel/intern/deform.c | 31 ++++++++++++---------- source/blender/editors/armature/armature_naming.c | 6 ++--- .../blender/editors/armature/armature_skinning.c | 7 +++-- source/blender/editors/armature/armature_utils.c | 6 ++--- source/blender/editors/armature/pose_edit.c | 6 ++--- source/blender/editors/armature/pose_select.c | 8 +++--- source/blender/editors/armature/pose_transform.c | 2 +- source/blender/editors/object/object_select.c | 8 +++--- source/blender/editors/sculpt_paint/paint_vertex.c | 8 +++--- 10 files changed, 44 insertions(+), 41 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index 435cad17e57..e203549fef5 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -91,6 +91,7 @@ void defvert_normalize_lock_map(struct MDeformVert *dvert, void BKE_deform_split_suffix(const char string[MAX_VGROUP_NAME], char base[MAX_VGROUP_NAME], char ext[MAX_VGROUP_NAME]); void BKE_deform_split_prefix(const char string[MAX_VGROUP_NAME], char base[MAX_VGROUP_NAME], char ext[MAX_VGROUP_NAME]); -void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME], int strip_number); +void BKE_deform_flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME], + const bool strip_number); #endif /* __BKE_DEFORM_H__ */ diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index a183872552d..dafc0c3c754 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -447,7 +447,7 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default) } else { bDeformGroup *dg; - char name[sizeof(dg->name)]; + char name_flip[sizeof(dg->name)]; int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__); for (i = 0; i < defbase_tot; i++) { @@ -461,9 +461,10 @@ int *defgroup_flip_map(Object *ob, int *flip_map_len, const bool use_default) if (use_default) map[i] = i; - flip_side_name(name, dg->name, FALSE); - if (strcmp(name, dg->name)) { - flip_num = defgroup_name_index(ob, name); + BKE_deform_flip_side_name(name_flip, dg->name, false); + + if (!STREQ(name_flip, dg->name)) { + flip_num = defgroup_name_index(ob, name_flip); if (flip_num >= 0) { map[i] = flip_num; map[flip_num] = i; /* save an extra lookup */ @@ -485,7 +486,7 @@ int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_defa } else { bDeformGroup *dg; - char name[sizeof(dg->name)]; + char name_flip[sizeof(dg->name)]; int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__); for (i = 0; i < defbase_tot; i++) { @@ -494,9 +495,9 @@ int *defgroup_flip_map_single(Object *ob, int *flip_map_len, const bool use_defa dg = BLI_findlink(&ob->defbase, defgroup); - flip_side_name(name, dg->name, FALSE); - if (strcmp(name, dg->name)) { - flip_num = defgroup_name_index(ob, name); + BKE_deform_flip_side_name(name_flip, dg->name, false); + if (!STREQ(name_flip, dg->name)) { + flip_num = defgroup_name_index(ob, name_flip); if (flip_num != -1) { map[defgroup] = flip_num; @@ -514,11 +515,12 @@ int defgroup_flip_index(Object *ob, int index, const bool use_default) int flip_index = -1; if (dg) { - char name[sizeof(dg->name)]; - flip_side_name(name, dg->name, 0); + char name_flip[sizeof(dg->name)]; + BKE_deform_flip_side_name(name_flip, dg->name, false); - if (strcmp(name, dg->name)) - flip_index = defgroup_name_index(ob, name); + if (!STREQ(name_flip, dg->name)) { + flip_index = defgroup_name_index(ob, name_flip); + } } return (flip_index == -1 && use_default) ? index : flip_index; @@ -602,7 +604,8 @@ void BKE_deform_split_prefix(const char string[MAX_VGROUP_NAME], char pre[MAX_VG /* finds the best possible flipped name. For renaming; check for unique names afterwards */ /* if strip_number: removes number extensions * note: don't use sizeof() for 'name' or 'from_name' */ -void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME], int strip_number) +void BKE_deform_flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_NAME], + const bool strip_number) { int len; char prefix[MAX_VGROUP_NAME] = ""; /* The part before the facing */ @@ -624,7 +627,7 @@ void flip_side_name(char name[MAX_VGROUP_NAME], const char from_name[MAX_VGROUP_ if (isdigit(name[len - 1])) { index = strrchr(name, '.'); // last occurrence if (index && isdigit(index[1])) { // doesnt handle case bone.1abc2 correct..., whatever! - if (strip_number == 0) { + if (strip_number == false) { BLI_strncpy(number, index, sizeof(number)); } *index = 0; diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 2228cb8386e..10e97240898 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -289,7 +289,6 @@ static int armature_flip_names_exec(bContext *C, wmOperator *UNUSED(op)) { Object *ob = CTX_data_edit_object(C); bArmature *arm; - char newname[MAXBONENAME]; /* paranoia checks */ if (ELEM(NULL, ob, ob->pose)) @@ -299,8 +298,9 @@ static int armature_flip_names_exec(bContext *C, wmOperator *UNUSED(op)) /* loop through selected bones, auto-naming them */ CTX_DATA_BEGIN(C, EditBone *, ebone, selected_editable_bones) { - flip_side_name(newname, ebone->name, TRUE); // 1 = do strip off number extensions - ED_armature_bone_rename(arm, ebone->name, newname); + char name_flip[MAXBONENAME]; + BKE_deform_flip_side_name(name_flip, ebone->name, true); + ED_armature_bone_rename(arm, ebone->name, name_flip); } CTX_DATA_END; diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c index 0301db4b4cf..5f15d15d478 100644 --- a/source/blender/editors/armature/armature_skinning.c +++ b/source/blender/editors/armature/armature_skinning.c @@ -346,11 +346,10 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob, /* find flipped group */ if (dgroup && mirror) { - char name[MAXBONENAME]; + char name_flip[MAXBONENAME]; - // 0 = don't strip off number extensions - flip_side_name(name, dgroup->name, FALSE); - dgroupflip[j] = defgroup_find_name(ob, name); + BKE_deform_flip_side_name(name_flip, dgroup->name, false); + dgroupflip[j] = defgroup_find_name(ob, name_flip); } } diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index f2f51dc1bd5..7efeeebcf1d 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -182,16 +182,16 @@ void ED_armature_ebone_to_mat4(EditBone *ebone, float mat[4][4]) EditBone *ED_armature_bone_get_mirrored(ListBase *edbo, EditBone *ebo) { EditBone *eboflip = NULL; - char name[MAXBONENAME]; + char name_flip[MAXBONENAME]; if (ebo == NULL) return NULL; - flip_side_name(name, ebo->name, FALSE); + BKE_deform_flip_side_name(name_flip, ebo->name, false); for (eboflip = edbo->first; eboflip; eboflip = eboflip->next) { if (ebo != eboflip) { - if (!strcmp(name, eboflip->name)) + if (!strcmp(name_flip, eboflip->name)) break; } } diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 31ff1e161e8..d1c096e6cf5 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -577,9 +577,9 @@ static int pose_flip_names_exec(bContext *C, wmOperator *UNUSED(op)) /* loop through selected bones, auto-naming them */ CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones) { - char newname[MAXBONENAME]; - flip_side_name(newname, pchan->name, TRUE); - ED_armature_bone_rename(arm, pchan->name, newname); + char name_flip[MAXBONENAME]; + BKE_deform_flip_side_name(name_flip, pchan->name, true); + ED_armature_bone_rename(arm, pchan->name, name_flip); } CTX_DATA_END; diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index a53d8050c5d..687b1f3f9bc 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -848,10 +848,10 @@ static int pose_bone_flip_active_exec(bContext *C, wmOperator *UNUSED(op)) if (arm->act_bone) { bPoseChannel *pchanf; - char name[MAXBONENAME]; - flip_side_name(name, arm->act_bone->name, TRUE); + char name_flip[MAXBONENAME]; + BKE_deform_flip_side_name(name_flip, arm->act_bone->name, true); - pchanf = BKE_pose_channel_find_name(ob->pose, name); + pchanf = BKE_pose_channel_find_name(ob->pose, name_flip); if (pchanf && pchanf->bone != arm->act_bone) { arm->act_bone->flag &= ~BONE_SELECTED; pchanf->bone->flag |= BONE_SELECTED; @@ -860,7 +860,7 @@ static int pose_bone_flip_active_exec(bContext *C, wmOperator *UNUSED(op)) /* in weightpaint we select the associated vertex group too */ if (ob_act->mode & OB_MODE_WEIGHT_PAINT) { - ED_vgroup_select_by_name(ob_act, name); + ED_vgroup_select_by_name(ob_act, name_flip); DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA); } diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index 79ca70a6189..4e66c329088 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -302,7 +302,7 @@ static bPoseChannel *pose_bone_do_paste(Object *ob, bPoseChannel *chan, short se /* get the name - if flipping, we must flip this first */ if (flip) - flip_side_name(name, chan->name, 0); /* 0 = don't strip off number extensions */ + BKE_deform_flip_side_name(name, chan->name, false); else BLI_strncpy(name, chan->name, sizeof(name)); diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 974dc3acef9..ffa9eed65b9 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -1078,12 +1078,12 @@ static int object_select_mirror_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, Base *, primbase, selected_bases) { - char tmpname[MAXBONENAME]; + char name_flip[MAXBONENAME]; - flip_side_name(tmpname, primbase->object->id.name + 2, TRUE); + BKE_deform_flip_side_name(name_flip, primbase->object->id.name + 2, true); - if (strcmp(tmpname, primbase->object->id.name + 2) != 0) { /* names differ */ - Object *ob = (Object *)BKE_libblock_find_name(ID_OB, tmpname); + if (!STREQ(name_flip, primbase->object->id.name + 2)) { + Object *ob = (Object *)BKE_libblock_find_name(ID_OB, name_flip); if (ob) { Base *secbase = BKE_scene_base_find(scene, ob); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index c8c38eebea9..714d67c8039 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -378,12 +378,12 @@ static int wpaint_mirror_vgroup_ensure(Object *ob, const int vgroup_active) if (defgroup) { int mirrdef; - char name[MAXBONENAME]; + char name_flip[MAXBONENAME]; - flip_side_name(name, defgroup->name, FALSE); - mirrdef = defgroup_name_index(ob, name); + BKE_deform_flip_side_name(name_flip, defgroup->name, false); + mirrdef = defgroup_name_index(ob, name_flip); if (mirrdef == -1) { - if (BKE_defgroup_new(ob, name)) { + if (BKE_defgroup_new(ob, name_flip)) { mirrdef = BLI_countlist(&ob->defbase) - 1; } } -- cgit v1.2.3