[Bf-blender-cvs] [a57a7975a16] master: Fix T51926: Selecting pose icon under expanded group in outliner causes crash.

Bastien Montagne noreply at git.blender.org
Thu Jun 29 10:10:08 CEST 2017


Commit: a57a7975a1625d0876ff6ac13c14d5784236eb7e
Author: Bastien Montagne
Date:   Thu Jun 29 10:09:17 2017 +0200
Branches: master
https://developer.blender.org/rBa57a7975a1625d0876ff6ac13c14d5784236eb7e

Fix T51926: Selecting pose icon under expanded group in outliner causes crash.

Cannot switch uninstantiated armature to Pose mode...

===================================================================

M	source/blender/editors/space_outliner/outliner_select.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 7e05c76b35b..18cc2a015e6 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -707,7 +707,12 @@ static eOLDrawState tree_element_active_pose(
 {
 	Object *ob = (Object *)tselem->id;
 	Base *base = BKE_scene_base_find(scene, 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);




More information about the Bf-blender-cvs mailing list