Commit: 2113dbb013f3ee37207c8ec3260d037c8a29f4c8
Author: Bastien Montagne
Date: Thu Jun 29 10:11:17 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB2113dbb013f3ee37207c8ec3260d037c8a29f4c8
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_outliner/outliner_select.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_outliner/outliner_select.c
index 459af31b921,18cc2a015e6..d9590d2af7f
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@@ -655,11 -703,16 +655,16 @@@ static eOLDrawState tree_element_active
}
static eOLDrawState tree_element_active_pose(
- bContext *C, Scene *scene, TreeElement *UNUSED(te), TreeStoreElem
*tselem, const eOLSetState set)
+ bContext *C, Scene *scene, SceneLayer *sl, TreeElement *UNUSED(te),
TreeStoreElem *tselem, const eOLSetState set)
{
Object *ob = (Object *)tselem->id;
- Base *base = BKE_scene_base_find(scene, ob);
+ 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
