diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-14 21:59:26 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-14 21:59:26 +0400 |
commit | f1a745c436887d14c8dbe1029154c13dda127ecd (patch) | |
tree | 1ef6b5c15242baf1e910e3e7791ffc8e42dc71ca /source/blender/editors/armature | |
parent | 4b3dafcaa765249c0787b41df014f32863cd202f (diff) |
2.5: Armature
* Bone Transform panel now works, using appropriate EditBone or
PoseChannel properties.
* Bone name and parent are now editable.
* Some other tweaks to the UI layouts for Armature and Bone.
* Notifiers for armature/editbone properties.
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/editarmature.c | 8 | ||||
-rw-r--r-- | source/blender/editors/armature/poseobject.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index d00f4c770d1..49f13d99af9 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -5095,9 +5095,9 @@ static void constraint_bone_name_fix(Object *ob, ListBase *conlist, char *oldnam /* called by UI for renaming a bone */ /* warning: make sure the original bone was not renamed yet! */ /* seems messy, but thats what you get with not using pointers but channel names :) */ -void armature_bone_rename(Object *ob, char *oldnamep, char *newnamep) +void ED_armature_bone_rename(bArmature *arm, char *oldnamep, char *newnamep) { - bArmature *arm= ob->data; + Object *ob; char newname[MAXBONENAME]; char oldname[MAXBONENAME]; @@ -5242,7 +5242,7 @@ void armature_flip_names(Scene *scene) if (ebone->flag & BONE_SELECTED) { BLI_strncpy(newname, ebone->name, sizeof(newname)); bone_flip_name(newname, 1); // 1 = do strip off number extensions - armature_bone_rename(obedit, ebone->name, newname); + ED_armature_bone_rename(arm, ebone->name, newname); } } } @@ -5263,7 +5263,7 @@ void armature_autoside_names(Scene *scene, short axis) if (ebone->flag & BONE_SELECTED) { BLI_strncpy(newname, ebone->name, sizeof(newname)); bone_autoside_name(newname, 1, axis, ebone->head[axis], ebone->tail[axis]); - armature_bone_rename(obedit, ebone->name, newname); + ED_armature_bone_rename(arm, ebone->name, newname); } } } diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 2913d1d13d9..f7d926ea18d 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -1346,7 +1346,7 @@ void pose_flip_names(Scene *scene) if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) { BLI_strncpy(newname, pchan->name, sizeof(newname)); bone_flip_name(newname, 1); // 1 = do strip off number extensions - armature_bone_rename(ob, pchan->name, newname); + ED_armature_bone_rename(arm, pchan->name, newname); } } } @@ -1375,7 +1375,7 @@ void pose_autoside_names(Scene *scene, short axis) if(pchan->bone->flag & (BONE_ACTIVE|BONE_SELECTED)) { BLI_strncpy(newname, pchan->name, sizeof(newname)); bone_autoside_name(newname, 1, axis, pchan->bone->head[axis], pchan->bone->tail[axis]); - armature_bone_rename(ob, pchan->name, newname); + ED_armature_bone_rename(arm, pchan->name, newname); } } } |