sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Outliner: Make alphabetical sorting optional

Browse Source 
A new option to the Outliner's View menu is added to enable/disable sorting of items.
This commit is contained in:
julianeisel 2015-01-19 01:01:23 +01:00
parent 90b5697459
commit ffe56536f1
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_outliner.py
View File

@ -86,6 +86,7 @@ class OUTLINER_MT_view(Menu):
space = context.space_data space = context.space_data
if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}: if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}:
layout.prop(space, "sort_alphabetically")
layout.prop(space, "show_restrict_columns") layout.prop(space, "show_restrict_columns")
layout.separator() layout.separator()
layout.operator("outliner.show_active") layout.operator("outliner.show_active")

3
source/blender/editors/space_outliner/outliner_tree.c
View File

@ -1312,6 +1312,9 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb)
TreeStoreElem *tselem; TreeStoreElem *tselem;
int totelem = 0; int totelem = 0;
if (soops->flag & SO_SKIP_SORTING)
return;
te = lb->last; te = lb->last;
if (te == NULL) return; if (te == NULL) return;
tselem = TREESTORE(te); tselem = TREESTORE(te);

1
source/blender/makesdna/DNA_space_types.h
View File

@ -273,6 +273,7 @@ typedef enum eSpaceOutliner_Flag {
SO_NEWSELECTED = (1 << 1), SO_NEWSELECTED = (1 << 1),
SO_HIDE_RESTRICTCOLS = (1 << 2), SO_HIDE_RESTRICTCOLS = (1 << 2),
SO_HIDE_KEYINGSETINFO = (1 << 3), SO_HIDE_KEYINGSETINFO = (1 << 3),
SO_SKIP_SORTING = (1 << 4),
} eSpaceOutliner_Flag; } eSpaceOutliner_Flag;
/* SpaceOops->outlinevis */ /* SpaceOops->outlinevis */

5
source/blender/makesrna/intern/rna_space.c
View File

@ -1594,6 +1594,11 @@ static void rna_def_space_outliner(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Complete Matches Only", "Only use complete matches of search string"); RNA_def_property_ui_text(prop, "Complete Matches Only", "Only use complete matches of search string");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_OUTLINER, NULL); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_OUTLINER, NULL);
prop = RNA_def_property(srna, "sort_alphabetically", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_SKIP_SORTING);
RNA_def_property_ui_text(prop, "Sort Alphabetically", "Sort items alphabetically");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_OUTLINER, NULL);
prop = RNA_def_property(srna, "show_restrict_columns", PROP_BOOLEAN, PROP_NONE); prop = RNA_def_property(srna, "show_restrict_columns", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_HIDE_RESTRICTCOLS); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_HIDE_RESTRICTCOLS);
RNA_def_property_ui_text(prop, "Show Restriction Columns", "Show column"); RNA_def_property_ui_text(prop, "Show Restriction Columns", "Show column");