svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / editors / space_view3d / drawobject.c
index ccd768d5c2aea92c5766ac662e53d8dc4b2fa4e9..06a88cd78665d36316bea91ceb175c7795b372dd 100644 (file)
@@ -5545,7 +5545,7 @@ static void drawObjectSelect(Scene *scene, View3D *v3d, ARegion *ar, Base *base)
                }
        }
        else if(ob->type==OB_ARMATURE) {
                }
        }
        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);
        }
 
                        draw_armature(scene, v3d, ar, base, OB_WIRE, FALSE, TRUE);
        }