Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_outliner / outliner_tree.c
index e2bd4c5672c0f0850c6b300985850e255bbcb2ab..00eb4efde02a528c4582f0bb1314900b69c3bbd8 100644 (file)
@@ -131,7 +131,7 @@ static void outliner_storage_cleanup(SpaceOops *soops)
                        }
                        
                        if (unused) {
-                               if (BLI_mempool_count(ts) == unused) {
+                               if (BLI_mempool_len(ts) == unused) {
                                        BLI_mempool_destroy(ts);
                                        soops->treestore = NULL;
                                        if (soops->treehash) {
@@ -141,7 +141,7 @@ static void outliner_storage_cleanup(SpaceOops *soops)
                                }
                                else {
                                        TreeStoreElem *tsenew;
-                                       BLI_mempool *new_ts = BLI_mempool_create(sizeof(TreeStoreElem), BLI_mempool_count(ts) - unused,
+                                       BLI_mempool *new_ts = BLI_mempool_create(sizeof(TreeStoreElem), BLI_mempool_len(ts) - unused,
                                                                                 512, BLI_MEMPOOL_ALLOW_ITER);
                                        BLI_mempool_iternew(ts, &iter);
                                        while ((tselem = BLI_mempool_iterstep(&iter))) {
@@ -469,7 +469,7 @@ static void outliner_object_reorder(
        TREESTORE(insert_element)->flag |= TSE_SELECTED;
 
        outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, outliner_find_selected_objects, &data);
-       BLI_LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) {
+       LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) {
                TreeElement *ten_selected = (TreeElement *)link->data;
                Object *ob = (Object *)TREESTORE(ten_selected)->id;
 
@@ -2233,7 +2233,7 @@ void outliner_build_tree(
 {
        TreeElement *te = NULL, *ten;
        TreeStoreElem *tselem;
-       int show_opened = !soops->treestore || !BLI_mempool_count(soops->treestore); /* on first view, we open scenes */
+       int show_opened = !soops->treestore || !BLI_mempool_len(soops->treestore); /* on first view, we open scenes */
 
        /* Are we looking for something - we want to tag parents to filter child matches
         * - NOT in datablocks view - searching all datablocks takes way too long to be useful