diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-02-05 14:39:58 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-02-05 14:39:58 +0300 |
| commit | c1bbda703f4ce32f26b3750fcafada5ef4ac6f53 (patch) | |
| tree | 6f6f25868e05e49d7e92d1f47ade044fc9a88016 /source/blender/editors/space_view3d | |
| parent | 29e11e3ef4fc4b36347347663d73a4762f116523 (diff) | |
Armature Drawing - Active Bone:
Active bones are now only highlighted if they are also selected. This reduces confusion over when something will get moved/edited.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 64cb4c901f9..fd6d2d36b63 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -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) { |