[Bf-blender-cvs] [7231cc5414d] soc-2020-outliner: Outliner: Remove creation order sort method

Nathan Craddock noreply at git.blender.org
Sun Jul 19 05:52:13 CEST 2020


Commit: 7231cc5414d1e92de4da824f0724539d2b1e3329
Author: Nathan Craddock
Date:   Sat Jul 18 16:43:27 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB7231cc5414d1e92de4da824f0724539d2b1e3329

Outliner: Remove creation order sort method

This was a placeholder while manual sort did not work. Manual sort
changes the "creation order" in the database lists so creation order was
the same ordering as manual.

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

M	source/blender/makesdna/DNA_space_types.h
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index c11f7ac7c95..461deb8b158 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -391,7 +391,6 @@ typedef enum eSpaceOutliner_Sort_Types {
   SO_SORT_FREE,
   SO_SORT_ALPHA,
   SO_SORT_TYPE,
-  SO_SORT_CREATION_ORDER,
 } eSpaceOutliner_Sort_Types;
 
 /** \} */
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 327bf5b7c18..c9b02a1e395 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3050,11 +3050,6 @@ static void rna_def_space_outliner(BlenderRNA *brna)
       {SO_SORT_FREE, "FREE", 0, "Manual", "Sort objects and collections manually"},
       {SO_SORT_ALPHA, "ALPHA", 0, "Name", "Sort objects and collections by name alphabetically"},
       {SO_SORT_TYPE, "TYPE", 0, "Type", "Sort objects by type"},
-      {SO_SORT_CREATION_ORDER,
-       "CREATION",
-       0,
-       "Creation Order",
-       "Sort objects and collections in the order they were created"},
       {0, NULL, 0, NULL, NULL},
   };



More information about the Bf-blender-cvs mailing list