kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: Use full name for scene_layer in alembic

Browse Source
This commit is contained in:
Sergey Sharybin 2017-11-09 15:45:09 +01:00
parent a956e7399a
commit 09d26cab0b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/alembic/intern/abc_exporter.cc
View File

@ -364,7 +364,7 @@ void AbcExporter::operator()(Main *bmain, float &progress, bool &was_canceled)
void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx)
{
for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
for (Base *base = static_cast<Base *>(m_settings.scene_layer->object_bases.first); base; base = base->next) {
Object *ob = base->object;
if (export_object(&m_settings, base, false)) {
@ -495,7 +495,7 @@ AbcTransformWriter * AbcExporter::createTransformWriter(EvaluationContext *eval_
void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx)
{
for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
for (Base *base = static_cast<Base *>(m_settings.scene_layer->object_bases.first); base; base = base->next) {
exploreObject(eval_ctx, base, NULL);
}
}

2
source/blender/alembic/intern/abc_exporter.h
View File

@ -46,7 +46,7 @@ struct ExportSettings {
ExportSettings();
Scene *scene;
SceneLayer *sl; // Scene layer to export; all its objects will be exported, unless selected_only=true
SceneLayer *scene_layer; // Scene layer to export; all its objects will be exported, unless selected_only=true
Depsgraph *depsgraph;
SimpleLogger logger;

16
source/blender/alembic/intern/alembic_capi.cc
View File

@ -347,7 +347,7 @@ bool ABC_export(
* Later in the 2.8 development process this may be replaced by using
* a specific collection for Alembic I/O, which can then be toggled
* between "real" objects and cached Alembic files. */
job->settings.sl = CTX_data_scene_layer(C);
job->settings.scene_layer = CTX_data_scene_layer(C);
job->settings.frame_start = params->frame_start;
job->settings.frame_end = params->frame_end;
@ -837,16 +837,16 @@ static void import_endjob(void *user_data)
/* Add object to scene. */
Base *base;
LayerCollection *lc;
SceneLayer *sl = data->scene_layer;
SceneLayer *scene_layer = data->scene_layer;
BKE_scene_layer_base_deselect_all(sl);
BKE_scene_layer_base_deselect_all(scene_layer);
lc = BKE_layer_collection_get_active(sl);
lc = BKE_layer_collection_get_active(scene_layer);
if (lc == NULL) {
BLI_assert(BLI_listbase_count_ex(&sl->layer_collections, 1) == 0);
BLI_assert(BLI_listbase_count_ex(&scene_layer->layer_collections, 1) == 0);
/* when there is no collection linked to this SceneLayer, create one */
SceneCollection *sc = BKE_collection_add(data->scene, NULL, NULL);
lc = BKE_collection_link(sl, sc);
lc = BKE_collection_link(scene_layer, sc);
}
for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
@ -855,8 +855,8 @@ static void import_endjob(void *user_data)
BKE_collection_object_add(data->scene, lc->scene_collection, ob);
base = BKE_scene_layer_base_find(sl, ob);
BKE_scene_layer_base_select(sl, base);
base = BKE_scene_layer_base_find(scene_layer, ob);
BKE_scene_layer_base_select(scene_layer, base);
DEG_id_tag_update_ex(data->bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
}