diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
| commit | 23807d1fb43de44ca7c4db5dc7bd92178f4b6a14 (patch) | |
| tree | 6d2e17c8405789363e69df000cf14207110428b2 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 02d2472baacd8ac091a29392a2bc9ac8693fb5e7 (diff) | |
| parent | dddfb5e1738830c325e796a474d0ea14d64654f3 (diff) | |
Merging trunk up to r39447.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 3746428b0c6..75cd250d831 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5524,7 +5524,7 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base) } } else if(ob->type==OB_ARMATURE) { - if(!(ob->mode & OB_MODE_POSE)) + if(!(ob->mode & OB_MODE_POSE && base == scene->basact)) draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, TRUE); } |