griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T54348: Bone dissolve gives invalid hierarchy

Browse Source 
Disconnected bones weren't handled correctly.
This commit is contained in:
Campbell Barton
2018-03-22 07:50:58 +01:00
parent ce51066e47
commit 865fbe343a
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

14
source/blender/editors/armature/armature_utils.c
View File

@@ -133,7 +133,10 @@ void bone_free(bArmature *arm, EditBone *bone)
BLI_freelinkN(arm->edbo, bone);
}
void ED_armature_edit_bone_remove(bArmature *arm, EditBone *exBone)
/**
* \param clear_connected: When false caller is responsible for keeping the flag in a valid state.
*/
void ED_armature_edit_bone_remove_ex(bArmature *arm, EditBone *exBone, bool clear_connected)
{
EditBone *curBone;
@@ -141,13 +144,20 @@ void ED_armature_edit_bone_remove(bArmature *arm, EditBone *exBone)
for (curBone = arm->edbo->first; curBone; curBone = curBone->next) {
if (curBone->parent == exBone) {
curBone->parent = exBone->parent;
curBone->flag &= ~BONE_CONNECTED;
if (clear_connected) {
curBone->flag &= ~BONE_CONNECTED;
}
}
}
bone_free(arm, exBone);
}
void ED_armature_edit_bone_remove(bArmature *arm, EditBone *exBone)
{
ED_armature_edit_bone_remove_ex(arm, exBone, true);
}
bool ED_armature_ebone_is_child_recursive(EditBone *ebone_parent, EditBone *ebone_child)
{
for (ebone_child = ebone_child->parent; ebone_child; ebone_child = ebone_child->parent) {

2
source/blender/editors/include/ED_armature.h
View File

@@ -146,6 +146,8 @@ void ED_armature_validate_active(struct bArmature *arm);
EditBone *ED_armature_edit_bone_add_primitive(struct Object *obedit_arm, float length, bool view_aligned);
EditBone *ED_armature_edit_bone_add(struct bArmature *arm, const char *name);
void ED_armature_edit_bone_remove_ex(struct bArmature *arm, EditBone *exBone, bool clear_connected);
void ED_armature_edit_bone_remove(struct bArmature *arm, EditBone *exBone);
bool ED_armature_ebone_is_child_recursive(EditBone *ebone_parent, EditBone *ebone_child);