[Bf-blender-cvs] [0b0347dcca] blender2.8: Cleanup: Rename outliner enum

[Julian Eisel]

Commit: 0b0347dcca07298a7d72772c23e7503c0505016f
Author: Julian Eisel
Date:   Wed Mar 1 11:28:17 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB0b0347dcca07298a7d72772c23e7503c0505016f

Cleanup: Rename outliner enum

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

M	source/blender/editors/space_outliner/outliner_collections.c
M	source/blender/editors/space_outliner/outliner_intern.h
M	source/blender/editors/space_outliner/outliner_utils.c

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

diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 39bb151f3c..87a9e019ee 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -290,7 +290,7 @@ struct CollectionDeleteData {
 	SpaceOops *soops;
 };
 
-static TreeTraversalReturn collection_delete_cb(TreeElement *te, void *customdata)
+static TreeTraversalAction collection_delete_cb(TreeElement *te, void *customdata)
 {
 	struct CollectionDeleteData *data = customdata;
 	TreeStoreElem *tselem = TREESTORE(te);
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index ddfc953cf4..096af69850 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -49,14 +49,14 @@ struct EditBone;
 struct wmKeyConfig;
 
 
-typedef enum TreeTraversalReturn {
+typedef enum TreeTraversalAction {
 	/* Continue traversal regularly, don't skip children. */
 	TRAVERSE_CONTINUE = 0,
 	/* Stop traversal */
 	TRAVERSE_BREAK,
 	/* Continue traversal, but skip childs of traversed element */
 	TRAVERSE_SKIP_CHILDS,
-} TreeTraversalReturn;
+} TreeTraversalAction;
 
 /**
  * Callback type for reinserting elements at a different position, used to allow user customizable element order.
@@ -64,7 +64,7 @@ typedef enum TreeTraversalReturn {
  */
 typedef void (*TreeElementReinsertFunc)(const struct Scene *scene, struct TreeElement *insert_element,
                                         struct TreeElement *insert_after);
-typedef TreeTraversalReturn (*TreeTraversalFunc)(struct TreeElement *te, void *customdata);
+typedef TreeTraversalAction (*TreeTraversalFunc)(struct TreeElement *te, void *customdata);
 
 
 typedef struct TreeElement {
diff --git a/source/blender/editors/space_outliner/outliner_utils.c b/source/blender/editors/space_outliner/outliner_utils.c
index 00b0a6a746..0e3a4e89fd 100644
--- a/source/blender/editors/space_outliner/outliner_utils.c
+++ b/source/blender/editors/space_outliner/outliner_utils.c
@@ -201,7 +201,7 @@ bool outliner_tree_traverse(const SpaceOops *soops, ListBase *tree, int filter_t
                             TreeTraversalFunc func, void *customdata)
 {
 	for (TreeElement *te = tree->first, *te_next; te; te = te_next) {
-		TreeTraversalReturn func_retval = TRAVERSE_CONTINUE;
+		TreeTraversalAction func_retval = TRAVERSE_CONTINUE;
 		/* in case te is freed in callback */
 		TreeStoreElem *tselem = TREESTORE(te);
 		ListBase subtree = te->subtree;