tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

change to ED_armature_bone_rename so theres never any duplicates dictionary items in 'ob->pose->chanhash' 

this turned out to be harmless but it did make ghash assert() because the ghash isnt flagged to allow duplicates.
This commit is contained in:
Campbell Barton 2013-10-01 13:33:43 +00:00
parent 9883641f46
commit d8020f54ba
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/armature/armature_naming.c
View File

@ -182,13 +182,17 @@ void ED_armature_bone_rename(bArmature *arm, const char *oldnamep, const char *n
if (ob->pose) {
bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, oldname);
if (pchan) {
GHash *gh = ob->pose->chanhash;
/* remove the old hash entry, and replace with the new name */
if (gh) {
BLI_assert(BLI_ghash_haskey(gh, pchan->name));
BLI_ghash_remove(gh, pchan->name, NULL, NULL);
}
BLI_strncpy(pchan->name, newname, MAXBONENAME);
if (ob->pose->chanhash) {
GHash *gh = ob->pose->chanhash;
/* remove the old hash entry, and replace with the new name */
BLI_ghash_remove(gh, oldname, NULL, NULL);
if (gh) {
BLI_ghash_insert(gh, pchan->name, pchan);
}
}