[Bf-blender-cvs] [f5982f2] master: Outliner: omit active-unselected in "Selected" view

Campbell Barton noreply at git.blender.org
Wed Feb 10 15:23:16 CET 2016


Commit: f5982f2a2983783a4c26599e623143f8a30e738d
Author: Campbell Barton
Date:   Thu Feb 11 00:55:11 2016 +1100
Branches: master
https://developer.blender.org/rBf5982f2a2983783a4c26599e623143f8a30e738d

Outliner: omit active-unselected in "Selected" view

This isn't selected, so misleading to include in selection list.

===================================================================

M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 9175a09..d688e62 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 51aba73..328e4cd 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"},




More information about the Bf-blender-cvs mailing list