diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-03 19:49:35 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-03 19:53:00 +0300 |
| commit | e1482841dd5dd55cb453d37d115ec80f44c02316 (patch) | |
| tree | 63cee90e2ab7b4316b4e36ffeb181700e99d6aab /source/blender/alembic | |
| parent | 1ad0cc6bde4746949eee7a9babb97178a05816c3 (diff) | |
| parent | 1fb30758034c2f83862bb7fc5f30a1a4d7b4510b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_object.h | 4 | ||||
| -rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h index 1462f93a422..cba79ffede5 100644 --- a/source/blender/alembic/intern/abc_object.h +++ b/source/blender/alembic/intern/abc_object.h @@ -90,7 +90,7 @@ struct ImportSettings { /* Length and frame offset of file sequences. */ int sequence_len; - int offset; + int sequence_offset; /* From MeshSeqCacheModifierData.read_flag */ int read_flag; @@ -107,7 +107,7 @@ struct ImportSettings { , is_sequence(false) , set_frame_range(false) , sequence_len(1) - , offset(0) + , sequence_offset(0) , read_flag(0) , validate_meshes(false) , cache_file(NULL) diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 54b49330355..20a04471e1d 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -762,7 +762,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa Scene *scene = data->scene; if (data->settings.is_sequence) { - SFRA = data->settings.offset; + SFRA = data->settings.sequence_offset; EFRA = SFRA + (data->settings.sequence_len - 1); CFRA = SFRA; } @@ -902,7 +902,7 @@ bool ABC_import(bContext *C, const char *filepath, float scale, bool is_sequence job->settings.is_sequence = is_sequence; job->settings.set_frame_range = set_frame_range; job->settings.sequence_len = sequence_len; - job->settings.offset = offset; + job->settings.sequence_offset = offset; job->settings.validate_meshes = validate_meshes; job->error_code = ABC_NO_ERROR; job->was_cancelled = false; |