Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_select.c
index 459af31b921cee529f6174d700a3f7ce8b153609..d9590d2af7f823c8690a57fd501a6bc949d8ae39 100644 (file)
@@ -659,7 +659,12 @@ static eOLDrawState tree_element_active_pose(
 {
        Object *ob = (Object *)tselem->id;
        Base *base = BKE_scene_layer_base_find(sl, ob);
-       
+
+       if (base == NULL) {
+               /* Armature not instantiated in current scene (e.g. inside an appended group...). */
+               return OL_DRAWSEL_NONE;
+       }
+
        if (set != OL_SETSEL_NONE) {
                if (scene->obedit)
                        ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO);