From f5982f2a2983783a4c26599e623143f8a30e738d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 11 Feb 2016 00:55:11 +1100 Subject: [PATCH] Outliner: omit active-unselected in "Selected" view This isn't selected, so misleading to include in selection list. --- source/blender/editors/space_outliner/outliner_tree.c | 2 +- source/blender/makesrna/intern/rna_space.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 9175a092cee..d688e628967 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1717,7 +1717,7 @@ void outliner_build_tree(Main *mainvar, Scene *scene, SpaceOops *soops) else if (soops->outlinevis == SO_SELECTED) { for (base = scene->base.first; base; base = base->next) { if (base->lay & scene->lay) { - if (base == BASACT || (base->flag & SELECT)) { + if (base->flag & SELECT) { ten = outliner_add_element(soops, &soops->tree, base->object, NULL, 0, 0); ten->directdata = base; } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 51aba737fa8..328e4cd8db9 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2050,7 +2050,7 @@ static void rna_def_space_outliner(BlenderRNA *brna) {SO_ALL_SCENES, "ALL_SCENES", 0, "All Scenes", "Display data-blocks in all scenes"}, {SO_CUR_SCENE, "CURRENT_SCENE", 0, "Current Scene", "Display data-blocks in current scene"}, {SO_VISIBLE, "VISIBLE_LAYERS", 0, "Visible Layers", "Display data-blocks in visible layers"}, - {SO_SELECTED, "SELECTED", 0, "Selected", "Display data-blocks of selected objects"}, + {SO_SELECTED, "SELECTED", 0, "Selected", "Display data-blocks of selected, visible objects"}, {SO_ACTIVE, "ACTIVE", 0, "Active", "Display data-blocks of active object"}, {SO_SAME_TYPE, "SAME_TYPES", 0, "Same Types", "Display data-blocks of all objects of same type as selected object"},