diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-14 09:20:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-14 09:20:28 +0300 |
| commit | c52ba88f7912124b3efeeb7709cc24497d3cc2ec (patch) | |
| tree | 761b113f50764eabd3261ae04a9a69fdf2ab9d90 /source/blender/editors/space_view3d/drawarmature.c | |
| parent | 96eeb9ad93fb31ed86f224622f709d4ca0e111fd (diff) | |
[#25211] Impossible to select an armature with shapes
broke since 2.49b, highly confusing function.
Stick bones dont draw solid so cant run glLoadName() in this case.
Tested pose/object mode with all armature draw types and view draw modes.
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 3ab86505bcf..89da66e269a 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -1753,8 +1753,8 @@ static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base, if (index != -1) index+= 0x10000; // pose bones count in higher 2 bytes only } - - if (draw_wire) { + /* stick bones have not been drawn yet so dont clear object selection in this case */ + if ((arm->drawtype != ARM_LINE) && draw_wire) { /* object tag, for bordersel optim */ glLoadName(index & 0xFFFF); index= -1; |