diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 13:44:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 13:47:57 +0300 |
| commit | 08fe885d06a011e2d1613be7e3a41b56a8b0e880 (patch) | |
| tree | 921a6d9b2bc571aefa37094edfa1e278e9770319 /source/blender/editors/space_outliner/outliner_collections.c | |
| parent | e46c49ff3dd67c7d759b581b677b4ab90cee3c46 (diff) | |
| parent | 889321e22b70006a550c923c0ace18e75732e106 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_collections.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 3726d0f6294..1ffe62fbc00 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -483,7 +483,7 @@ static int collection_objects_add_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, struct Object *, ob, selected_objects) { - LINKLIST_FOREACH(LinkData *, link, &data.scene_collections_array) { + BLI_LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) { SceneCollection *scene_collection = link->data; BKE_collection_object_add( &scene->id, @@ -538,7 +538,7 @@ static int collection_objects_remove_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN (C, struct Object *, ob, selected_objects) { - LINKLIST_FOREACH(LinkData *, link, &data.scene_collections_array) { + BLI_LISTBASE_FOREACH (LinkData *, link, &data.scene_collections_array) { SceneCollection *scene_collection = link->data; BKE_collection_object_remove( bmain, |