diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 17:27:44 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 17:38:55 +0300 |
| commit | 405980b1facff4a76e3661a412eab1d072d0236f (patch) | |
| tree | 5ae5b79ac5bb91c2dc8d732531e7db4e67abee45 /source/blender/alembic/intern/alembic_capi.cc | |
| parent | 7530c54c3cf38016d9038e6879c8ee2b1bd14c9e (diff) | |
| parent | 89eb05a8908130f8668e4c677d63f3d2b89e68bb (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
# source/blender/alembic/intern/abc_exporter.h
# source/blender/alembic/intern/alembic_capi.cc
# tests/gtests/alembic/abc_export_test.cc
Diffstat (limited to 'source/blender/alembic/intern/alembic_capi.cc')
| -rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index e7c7213cecb..730a574e649 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -263,7 +263,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo try { Scene *scene = data->scene; - AbcExporter exporter(&data->eval_ctx, scene, data->filename, data->settings); + AbcExporter exporter(data->bmain, &data->eval_ctx, scene, data->filename, data->settings); const int orig_frame = CFRA; |