diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-03 04:56:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-03 04:56:02 +0300 |
commit | 6b767b8018cbf5ca5657cad842271d8d6327ddd0 (patch) | |
tree | 0ccc6e91534c8cca4016866c387793a4668e3b74 /source/blender/editors/space_view3d/drawarmature.c | |
parent | b9c3bfa053fb3e86ad00a5f551a96f715e4a6818 (diff) |
fix [#24499] Consistency Issue with LassoSelect/ExtendOption
Added extend option to lasso.
also...
- selecting bones wasn't checking their layer of if they were hidden in a number of places.
- fixed memory leak.
small unrealed changes
- added PBONE_VISIBLE macro
- renamed functions used for paint selectoin from *_tface to paintface_*. sine they no longer have anything todo with tface's.
- removed scanfill include from BLI_blenlib.h, this is only used in very few places and quite specific.
Noticed lasso select is broken for metaballs and face mask mode but this has been the case for a while, will look into it next.
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 33776abf4a0..8cfb11478be 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1979,7 +1979,7 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt) /* catch exception for bone with hidden parent */ flag= eBone->flag; - if ( (eBone->parent) && ((eBone->parent->flag & BONE_HIDDEN_A) || (eBone->parent->layer & arm->layer)==0) ) + if ( (eBone->parent) && !EBONE_VISIBLE(arm, eBone->parent)) flag &= ~BONE_CONNECTED; /* set temporary flag for drawing bone as active, but only if selected */ @@ -2018,7 +2018,7 @@ static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt) /* catch exception for bone with hidden parent */ flag= eBone->flag; - if ( (eBone->parent) && ((eBone->parent->flag & BONE_HIDDEN_A) || (eBone->parent->layer & arm->layer)==0) ) + if ( (eBone->parent) && !EBONE_VISIBLE(arm, eBone->parent)) flag &= ~BONE_CONNECTED; /* set temporary flag for drawing bone as active, but only if selected */ |