diff options
author | Dan Eicher <dan@eu.phorio.us> | 2013-04-07 01:37:35 +0400 |
---|---|---|
committer | Dan Eicher <dan@eu.phorio.us> | 2013-04-07 01:37:35 +0400 |
commit | c3725021ab3b384557dd8f718aa7e378a5eeeef0 (patch) | |
tree | ae70bd8cd842384d96f6701047ae55d051dbaf78 /source/blender | |
parent | ba1dc9b1b00764e3e93f2e9d6040ba92df3fe48d (diff) |
Clicking on an outliner object in an unselected scene switches to the scene but doesn't set it as the active object
Based on commit soc-2012-bratwurst:r48292 by Jorge Rodriquez
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 29f1b3fb5a3..afc23efef55 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -209,7 +209,7 @@ static int tree_element_set_active_object(bContext *C, Scene *scene, SpaceOops } /* find associated base in current scene */ - base = BKE_scene_base_find(scene, ob); + base = BKE_scene_base_find(sce, ob); if (base) { if (set == 2) { @@ -221,22 +221,22 @@ static int tree_element_set_active_object(bContext *C, Scene *scene, SpaceOops } else { /* deleselect all */ - BKE_scene_base_deselect_all(scene); + BKE_scene_base_deselect_all(sce); ED_base_object_select(base, BA_SELECT); } if (recursive) { /* Recursive select/deselect for Object hierarchies */ - do_outliner_object_select_recursive(scene, ob, (ob->flag & SELECT) != 0); + do_outliner_object_select_recursive(sce, ob, (ob->flag & SELECT) != 0); } if (C) { ED_base_object_activate(C, base); /* adds notifier */ - WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene); + WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, sce); } } - if (ob != scene->obedit) + if (ob != sce->obedit) ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); return 1; |