diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-22 09:42:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-22 11:38:47 +0300 |
| commit | 557e1b02de7fcfa42f1ba372d4828e6a458cad7a (patch) | |
| tree | a799a5eee9577ac137f4f4d840702fcbab716c86 | |
| parent | 5da3aecefd71b99b4e9e055d51dc3fd8913ad485 (diff) | |
Fix bone dissolve using wrong envelope radius
Also correctly copy bone tip selection when dissolving.
| -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 47e73f9b777..8b2f6b458d3 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -1456,6 +1456,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; @@ -1469,7 +1470,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; } } |