Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-07-07 17:56:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-07-07 17:56:01 +0300
commitc8be112523fb0fe2f532ff2351fe3c699e63b544 (patch)
treea83282feb0abf8e2a73c1c0ba3266a2bc5437668
parent6e6073e13ccf7965bb36c2b4d3349ca967bc505e (diff)
RNA: rename sorting -> sort
Shorter and consistent with other RNA.
-rw-r--r--release/scripts/startup/bl_ui/space_dopesheet.py2
-rw-r--r--source/blender/makesrna/intern/rna_action.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index cea4eaf5149..d6d91980201 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -101,7 +101,7 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
if bpy.data.grease_pencil:
row.prop(dopesheet, "show_gpencil", text="")
- layout.prop(dopesheet, "use_datablock_sorting", text="")
+ layout.prop(dopesheet, "use_datablock_sort", text="")
#######################################
# DopeSheet Editor - General/Standard UI
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 4876a6132cb..8d7e47e8402 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -308,10 +308,11 @@ static void rna_def_dopesheet(BlenderRNA *brna)
RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
- prop = RNA_def_property(srna, "use_datablock_sorting", PROP_BOOLEAN, PROP_NONE);
+ prop = RNA_def_property(srna, "use_datablock_sort", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_NO_DB_SORT);
RNA_def_property_ui_text(prop, "Sort Datablocks",
- "Alphabetically sorts datablocks - mainly objects in the scene (disable to increase viewport speed)");
+ "Alphabetically sorts datablocks - mainly objects in the scene "
+ "(disable to increase viewport speed)");
RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);