Commit: e91148e463a37ee99f68cc955d0b9d59dbb32025 Author: Campbell Barton Date: Mon Jan 19 14:22:02 2015 +1100 Branches: master https://developer.blender.org/rBe91148e463a37ee99f68cc955d0b9d59dbb32025
RNA/API: name outliner sort option like UIList =================================================================== M release/scripts/startup/bl_ui/space_outliner.py M source/blender/editors/space_outliner/outliner_tree.c M source/blender/makesdna/DNA_space_types.h M source/blender/makesrna/intern/rna_space.c =================================================================== diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index ca2d11d..47c8cc6 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -86,7 +86,7 @@ class OUTLINER_MT_view(Menu): space = context.space_data if space.display_mode not in {'DATABLOCKS', 'USER_PREFERENCES', 'KEYMAPS'}: - layout.prop(space, "sort_alphabetically") + layout.prop(space, "use_sort_alpha") layout.prop(space, "show_restrict_columns") layout.separator() layout.operator("outliner.show_active") diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index f1a7a98..a4b1231 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1312,7 +1312,7 @@ static void outliner_sort(SpaceOops *soops, ListBase *lb) TreeStoreElem *tselem; int totelem = 0; - if (soops->flag & SO_SKIP_SORTING) + if (soops->flag & SO_SKIP_SORT_ALPHA) return; te = lb->last; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 44eb873..82ab0cc 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -273,7 +273,7 @@ typedef enum eSpaceOutliner_Flag { SO_NEWSELECTED = (1 << 1), SO_HIDE_RESTRICTCOLS = (1 << 2), SO_HIDE_KEYINGSETINFO = (1 << 3), - SO_SKIP_SORTING = (1 << 4), + SO_SKIP_SORT_ALPHA = (1 << 4), } eSpaceOutliner_Flag; /* SpaceOops->outlinevis */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 6fea135..d1d39d6 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1594,9 +1594,9 @@ 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_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"); + prop = RNA_def_property(srna, "use_sort_alpha", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SO_SKIP_SORT_ALPHA); + RNA_def_property_ui_text(prop, "Sort Alphabetically", ""); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_OUTLINER, NULL); prop = RNA_def_property(srna, "show_restrict_columns", PROP_BOOLEAN, PROP_NONE); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs