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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-31 15:16:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-31 15:16:13 +0300
commit4f11ffcce74cfb0b87d69d017aa0c3371f78e320 (patch)
treed41a86e3189889ec2f736b9ebf6cffd09abf69f6 /source/blender/editors/space_outliner/outliner_select.c
parentc2d81f257f608f00f827eccaff33df62ad91e29f (diff)
Fix outliner crash clicking on pose bones
From 15317775c, we can't assume directdata is a Base. This matches logic from master.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_select.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index e61ded299d1..931af08c717 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -165,11 +165,7 @@ static eOLDrawState tree_element_set_active_object(
}
/* find associated base in current scene */
- if (te->directdata) {
- base = te->directdata;
- } else {
- base = BKE_scene_layer_base_find(sl, ob);
- }
+ base = BKE_scene_layer_base_find(sl, ob);
if (base) {
if (set == OL_SETSEL_EXTEND) {