diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-16 17:40:00 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-16 17:40:00 +0300 |
| commit | 15317775c5e8fc082797424aaa80773eb3a24428 (patch) | |
| tree | ff87fd38ec021a7c05102d687ab4edcbd4d3e1bc /source/blender/editors/space_outliner/outliner_select.c | |
| parent | 3826e77593e44b441dc4f4162083c4a3ae6fe044 (diff) | |
Outliner: Bring back "activate" object when selecting from outliner
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 157467b1aaf..e61ded299d1 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -165,7 +165,11 @@ static eOLDrawState tree_element_set_active_object( } /* find associated base in current scene */ - base = BKE_scene_base_find(scene, ob); + if (te->directdata) { + base = te->directdata; + } else { + base = BKE_scene_layer_base_find(sl, ob); + } if (base) { if (set == OL_SETSEL_EXTEND) { |