[Bf-blender-cvs] [5c4fc93f67f] master: Fix T52538: Outliner crash when displaying groups and using Show Active on editmode bone not in any groups

Bastien Montagne noreply at git.blender.org
Sat Aug 26 12:28:43 CEST 2017


Commit: 5c4fc93f67f4133b5e4355f537d7858d589ca54d
Author: Bastien Montagne
Date:   Sat Aug 26 12:27:37 2017 +0200
Branches: master
https://developer.blender.org/rB5c4fc93f67f4133b5e4355f537d7858d589ca54d

Fix T52538: Outliner crash when displaying groups and using Show Active on editmode bone not in any groups

There's no guaranty that given ID is found in current outliner tree...

Safe for 2.79, though not a regression.

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

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

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

diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c
index 265a19b9e7e..f4089667b04 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -1092,7 +1092,7 @@ static int outliner_show_active_exec(bContext *C, wmOperator *UNUSED(op))
 
 	te = outliner_find_id(so, &so->tree, &obact->id);
 
-	if (obact->type == OB_ARMATURE) {
+	if (te != NULL && obact->type == OB_ARMATURE) {
 		/* traverse down the bone hierarchy in case of armature */
 		TreeElement *te_obact = te;



More information about the Bf-blender-cvs mailing list