diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-22 09:42:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-22 09:50:03 +0300 |
commit | ce51066e47175a38fd205987b6e6acc1a805dbe0 (patch) | |
tree | 62278f121688ac34831f6bab00d0a9778823e852 /source/blender/editors/armature | |
parent | 5ba5254ec1ebba6c1e89b663592d716b92e13165 (diff) |
Fix bone dissolve using wrong envelope radius
Also correctly copy bone tip selection when dissolving.
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/armature_edit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index a2fbfe645f7..17d60d2b4a0 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -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; } } |