diff options
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 3d5f12a94fd..efc28eea917 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -494,7 +494,7 @@ static int collection_objects_add_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, struct Object *, ob, selected_objects) { - BLI_LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) { + LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) { SceneCollection *scene_collection = link->data; BKE_collection_object_add( &scene->id, @@ -549,7 +549,7 @@ static int collection_objects_remove_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, struct Object *, ob, selected_objects) { - BLI_LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) { + LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) { SceneCollection *scene_collection = link->data; BKE_collection_object_remove( bmain, @@ -605,7 +605,7 @@ static int object_collection_remove_exec(bContext *C, wmOperator *UNUSED(op)) 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 *te = (TreeElement *)link->data; Object *ob = (Object *)TREESTORE(te)->id; SceneCollection *scene_collection = NULL; @@ -683,7 +683,7 @@ static int object_add_to_new_collection_exec(bContext *C, wmOperator *op) scene_collection_parent = outliner_scene_collection_from_tree_element(te_parent); scene_collection_new = BKE_collection_add(owner_id, scene_collection_parent, scene_collection_parent->type, NULL); - BLI_LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) { + LISTBASE_FOREACH (LinkData *, link, &data.objects_selected_array) { TreeElement *te = (TreeElement *)link->data; Object *ob = (Object *)TREESTORE(te)->id; BKE_collection_object_add(owner_id, scene_collection_new, ob); diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index e2bd4c5672c..00eb4efde02 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -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 |