diff options
Diffstat (limited to 'source/blender/alembic')
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 4 | ||||
-rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index f06959762d5..093c4de085e 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -409,7 +409,7 @@ void AbcExporter::exploreTransform(Depsgraph *depsgraph, Base *ob_base, Object * continue; } - if (link->type == OB_DUPLIGROUP) { + if (link->type == OB_DUPLICOLLECTION) { dupli_ob = link->ob; dupli_parent = (dupli_ob->parent) ? dupli_ob->parent : ob; @@ -522,7 +522,7 @@ void AbcExporter::exploreObject(Depsgraph *depsgraph, Base *ob_base, Object *dup if (m_settings.renderable_only && link->no_draw) { continue; } - if (link->type == OB_DUPLIGROUP) { + if (link->type == OB_DUPLICOLLECTION) { fake_base.object = link->ob; exploreObject(depsgraph, &fake_base, ob); } diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 35877f9f5a8..1a6990a1de8 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -840,18 +840,12 @@ static void import_endjob(void *user_data) BKE_view_layer_base_deselect_all(view_layer); lc = BKE_layer_collection_get_active(view_layer); - if (lc == NULL) { - BLI_assert(BLI_listbase_count_at_most(&view_layer->layer_collections, 1) == 0); - /* when there is no collection linked to this ViewLayer, create one */ - SceneCollection *sc = BKE_collection_add(&data->scene->id, NULL, COLLECTION_TYPE_NONE, NULL); - lc = BKE_collection_link(view_layer, sc); - } for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) { Object *ob = (*iter)->object(); ob->lay = data->scene->lay; - BKE_collection_object_add(&data->scene->id, lc->scene_collection, ob); + BKE_collection_object_add(data->bmain, lc->collection, ob); base = BKE_view_layer_base_find(view_layer, ob); BKE_view_layer_base_select(view_layer, base); |