Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-08-26 13:27:37 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-08-26 13:28:21 +0300
commit5c4fc93f67f4133b5e4355f537d7858d589ca54d (patch)
tree20940cb95c9a0d710de35a5845e4f52a7b5af8d1 /source
parent58d92cefbdf77c0e1b1882a02fabd6627a8f41ee (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_edit.c2
1 files changed, 1 insertions, 1 deletions
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;