sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Armature Drawing - Active Bone:

Browse Source 
Active bones are now only highlighted if they are also selected. This reduces confusion over when something will get moved/edited.
This commit is contained in:
Joshua Leung 2010-02-05 11:39:58 +00:00
parent 29e11e3ef4
commit c1bbda703f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/space_view3d/drawarmature.c
View File

@ -1636,8 +1636,8 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
if ( (bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P|BONE_HIDDEN_PG)) )
flag &= ~BONE_CONNECTED;
/* set temporary flag for drawing bone as active */
if (bone == arm->act_bone)
/* set temporary flag for drawing bone as active, but only if selected */
if ((bone == arm->act_bone) && (bone->flag & BONE_SELECTED))
flag |= BONE_DRAW_ACTIVE;
/* set color-set to use */
@ -1721,8 +1721,8 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
if ((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P|BONE_HIDDEN_PG)))
flag &= ~BONE_CONNECTED;
/* set temporary flag for drawing bone as active */
if (bone == arm->act_bone)
/* set temporary flag for drawing bone as active, but only if selected */
if ((bone == arm->act_bone) && (bone->flag & BONE_SELECTED))
flag |= BONE_DRAW_ACTIVE;
draw_custom_bone(scene, v3d, rv3d, pchan->custom, OB_WIRE, arm->flag, flag, index, bone->length);
@ -1816,8 +1816,8 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
if ((bone->parent) && (bone->parent->flag & (BONE_HIDDEN_P|BONE_HIDDEN_PG)))
flag &= ~BONE_CONNECTED;
/* set temporary flag for drawing bone as active */
if (bone == arm->act_bone)
/* set temporary flag for drawing bone as active, but only if selected */
if ((bone == arm->act_bone) && (bone->flag & BONE_SELECTED))
flag |= BONE_DRAW_ACTIVE;
/* extra draw service for pose mode */
@ -1980,8 +1980,8 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt)
if ( (eBone->parent) && ((eBone->parent->flag & BONE_HIDDEN_A) || (eBone->parent->layer & arm->layer)==0) )
flag &= ~BONE_CONNECTED;
/* set temporary flag for drawing bone as active */
if (eBone == arm->act_edbone)
/* set temporary flag for drawing bone as active, but only if selected */
if ((eBone == arm->act_edbone) && (eBone->flag & BONE_SELECTED))
flag |= BONE_DRAW_ACTIVE;
if (arm->drawtype==ARM_ENVELOPE)
@ -2019,8 +2019,8 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt)
if ( (eBone->parent) && ((eBone->parent->flag & BONE_HIDDEN_A) || (eBone->parent->layer & arm->layer)==0) )
flag &= ~BONE_CONNECTED;
/* set temporary flag for drawing bone as active */
if (eBone == arm->act_edbone)
/* set temporary flag for drawing bone as active, but only if selected */
if ((eBone == arm->act_edbone) && (eBone->flag & BONE_SELECTED))
flag |= BONE_DRAW_ACTIVE;
if (arm->drawtype == ARM_ENVELOPE) {