diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-22 09:50:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-22 09:50:58 +0300 |
| commit | 865fbe343a9067f342c45fb2a1a63eca0f7cf2d7 (patch) | |
| tree | 033f1552d92497da98e38d1fa95cd8d4cd162acb /source/blender/editors/armature/armature_edit.c | |
| parent | ce51066e47175a38fd205987b6e6acc1a805dbe0 (diff) | |
Fix T54348: Bone dissolve gives invalid hierarchy
Disconnected bones weren't handled correctly.
Diffstat (limited to 'source/blender/editors/armature/armature_edit.c')
| -rw-r--r-- | source/blender/editors/armature/armature_edit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 17d60d2b4a0..9a4a0eecfcd 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -1460,7 +1460,7 @@ static int armature_dissolve_selected_exec(bContext *C, wmOperator *UNUSED(op)) 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); + ED_armature_edit_bone_remove_ex(arm, ebone, false); changed = true; } } @@ -1469,9 +1469,8 @@ static int armature_dissolve_selected_exec(bContext *C, wmOperator *UNUSED(op)) for (ebone = arm->edbo->first; ebone; ebone = ebone->next) { if (ebone->parent && ebone->parent->temp.ebone && - (ebone->flag & BONE_CONNECTED) == 0) + (ebone->flag & BONE_CONNECTED)) { - ebone->flag |= BONE_CONNECTED; ebone->rad_head = ebone->parent->rad_tail; } } |