archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix bone dissolve using wrong envelope radius

Browse Source 
Also correctly copy bone tip selection when dissolving.
This commit is contained in:
Campbell Barton
2018-03-22 07:42:17 +01:00
parent 5ba5254ec1
commit ce51066e47
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/armature/armature_edit.c
View File

@@ -1458,6 +1458,7 @@ static int armature_dissolve_selected_exec(bContext *C, wmOperator *UNUSED(op))
if (ebone->flag & BONE_DONE) {
copy_v3_v3(ebone->parent->tail, ebone->tail);
ebone->parent->rad_tail = ebone->rad_tail;
SET_FLAG_FROM_TEST(ebone->parent->flag, ebone->flag & BONE_TIPSEL, BONE_TIPSEL);
ED_armature_edit_bone_remove(arm, ebone);
changed = true;
@@ -1471,7 +1472,7 @@ static int armature_dissolve_selected_exec(bContext *C, wmOperator *UNUSED(op))
(ebone->flag & BONE_CONNECTED) == 0)
{
ebone->flag |= BONE_CONNECTED;
ebone->rad_head = ebone->parent->rad_head;
ebone->rad_head = ebone->parent->rad_tail;
}
}