[Bf-blender-cvs] [ce51066e471] master: Fix bone dissolve using wrong envelope radius
Campbell Barton
noreply at git.blender.org
Thu Mar 22 07:52:44 CET 2018
Commit: ce51066e47175a38fd205987b6e6acc1a805dbe0
Author: Campbell Barton
Date: Thu Mar 22 07:42:17 2018 +0100
Branches: master
https://developer.blender.org/rBce51066e47175a38fd205987b6e6acc1a805dbe0
Fix bone dissolve using wrong envelope radius
Also correctly copy bone tip selection when dissolving.
===================================================================
M source/blender/editors/armature/armature_edit.c
===================================================================
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;
}
}
More information about the Bf-blender-cvs
mailing list