[Bf-blender-cvs] [95448e8] master: Fix minor glitch w/ edit-bone center

Campbell Barton noreply at git.blender.org
Wed Mar 9 06:19:52 CET 2016


Commit: 95448e851bbdfcadcef8669cef8b2f8086542dda
Author: Campbell Barton
Date:   Wed Mar 9 16:05:27 2016 +1100
Branches: master
https://developer.blender.org/rB95448e851bbdfcadcef8669cef8b2f8086542dda

Fix minor glitch w/ edit-bone center

Don't include the same point multiple times when calculating center with connected bones.

===================================================================

M	source/blender/editors/transform/transform_manipulator.c

===================================================================

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index c3ac196..992fde0 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -367,7 +367,13 @@ static int calc_manipulator_stats(const bContext *C)
 							calc_tw_center(scene, ebo->tail);
 							totsel++;
 						}
-						if (ebo->flag & BONE_ROOTSEL) {
+						if ((ebo->flag & BONE_ROOTSEL) &&
+						    /* don't include same point multiple times */
+						    ((ebo->flag & BONE_CONNECTED) &&
+						     (ebo->parent != NULL) &&
+						     (ebo->parent->flag & BONE_TIPSEL) &&
+						     EBONE_VISIBLE(arm, ebo->parent)) == 0)
+						{
 							calc_tw_center(scene, ebo->head);
 							totsel++;
 						}




More information about the Bf-blender-cvs mailing list