[Bf-blender-cvs] [557e1b02de7] blender-v2.79b-release: Fix bone dissolve using wrong envelope radius

Campbell Barton noreply at git.blender.org
Thu Mar 22 09:39:18 CET 2018


Commit: 557e1b02de7fcfa42f1ba372d4828e6a458cad7a
Author: Campbell Barton
Date:   Thu Mar 22 07:42:17 2018 +0100
Branches: blender-v2.79b-release
https://developer.blender.org/rB557e1b02de7fcfa42f1ba372d4828e6a458cad7a

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



More information about the Bf-blender-cvs mailing list