Commit: c8be112523fb0fe2f532ff2351fe3c699e63b544
Author: Campbell Barton
Date:   Fri Jul 8 00:56:01 2016 +1000
Branches: master
https://developer.blender.org/rBc8be112523fb0fe2f532ff2351fe3c699e63b544

RNA: rename sorting -> sort

Shorter and consistent with other RNA.

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

M       release/scripts/startup/bl_ui/space_dopesheet.py
M       source/blender/makesrna/intern/rna_action.c

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

diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py 
b/release/scripts/startup/bl_ui/space_dopesheet.py
index cea4eaf..d6d9198 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 4876a61..8d7e47e 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);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to