diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-01 13:28:17 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-01 13:28:17 +0300 |
commit | 0b0347dcca07298a7d72772c23e7503c0505016f (patch) | |
tree | 52f27e30ee17148c8868c1c7b49827a03e70df49 | |
parent | 512fb74980c5ebc70fe625654b104a5c6e6b498c (diff) |
Cleanup: Rename outliner enum
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 39bb151f3c3..87a9e019ee7 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 ddfc953cf44..096af698506 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 00b0a6a746c..0e3a4e89fdf 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; |