diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-07 23:28:48 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-07 23:28:48 +0300 |
commit | 89974f154669d38ddb36ff839a5c8191affb6691 (patch) | |
tree | 4a9d5dcff4e4ba168decd9b9247ee3f7f7ce8edb /source/blender/src/editarmature.c | |
parent | 44c9b42f605a6c9b1ca57de949c524352edf4e25 (diff) |
Orange fixes;
- protected editing library data names in outliner
- layer-bone recode caused selection from posemode not to flush correctly
to editmode
Diffstat (limited to 'source/blender/src/editarmature.c')
-rw-r--r-- | source/blender/src/editarmature.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index 3f6ea16785b..73dc558a090 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -137,6 +137,8 @@ static void make_boneList(ListBase* list, ListBase *bones, EditBone *parent) else eBone->flag |= BONE_ROOTSEL; } + else + eBone->flag &= ~BONE_ROOTSEL; VECCOPY(eBone->head, curBone->arm_head); VECCOPY(eBone->tail, curBone->arm_tail); @@ -1903,7 +1905,7 @@ void deselectall_posearmature (Object *ob, int test) /* Set the flags accordingly */ for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) { if(pchan->bone->layer & arm->layer) { - if(selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_ACTIVE); + if(selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL|BONE_ACTIVE); else if(selectmode==1) pchan->bone->flag |= BONE_SELECTED; else pchan->bone->flag &= ~BONE_ACTIVE; } |