diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 11:00:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-01 11:01:53 +0300 |
| commit | 7aed2de798b1e5f8663e8fe608a99f6c9f53c382 (patch) | |
| tree | 1f811fd3d80e3cce969db7e317b5629e54cbe5ce /source/blender/blenkernel/intern/collection.c | |
| parent | 1fc5eb305a2bd61ed465db376cec73a3822c0bf6 (diff) | |
Cleanup: macro's w/ an _END need a matching _BEGIN
Convention from 2.7x, since some looping macros don't need an '_END',
it avoids confusion to keep this.
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index c92096efd07..ffd5aea35ea 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -218,7 +218,7 @@ bool BKE_collection_remove(ID *owner_id, SceneCollection *sc) ListBase collection_objects; BLI_duplicatelist(&collection_objects, &sc->objects); - FOREACH_SCENE_COLLECTION(owner_id, scene_collection_iter) + FOREACH_SCENE_COLLECTION_BEGIN(owner_id, scene_collection_iter) { if (scene_collection_iter == sc) { continue; @@ -405,7 +405,7 @@ bool BKE_collection_object_add(const ID *owner_id, SceneCollection *sc, Object * */ void BKE_collection_object_add_from(Scene *scene, Object *ob_src, Object *ob_dst) { - FOREACH_SCENE_COLLECTION(scene, sc) + FOREACH_SCENE_COLLECTION_BEGIN(scene, sc) { if (BLI_findptr(&sc->objects, ob_src, offsetof(LinkData, data))) { collection_object_add(&scene->id, sc, ob_dst); @@ -480,7 +480,7 @@ bool BKE_collections_object_remove(Main *bmain, ID *owner_id, Object *ob, const BLI_assert(GS(owner_id->name) == ID_GR); } - FOREACH_SCENE_COLLECTION(owner_id, sc) + FOREACH_SCENE_COLLECTION_BEGIN(owner_id, sc) { removed |= BKE_collection_object_remove(bmain, owner_id, sc, ob, free_us); } @@ -552,7 +552,7 @@ Group *BKE_collection_group_create(Main *bmain, Scene *scene, LayerCollection *l sc_dst = BKE_collection_add(&group->id, NULL, COLLECTION_TYPE_GROUP_INTERNAL, sc_src->name); BKE_collection_copy_data(sc_dst, sc_src, 0); - FOREACH_SCENE_COLLECTION(&group->id, sc_group) + FOREACH_SCENE_COLLECTION_BEGIN(&group->id, sc_group) { sc_group->type = COLLECTION_TYPE_GROUP_INTERNAL; } |