Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compatibility for AbcCoreOgawa::ReadArchive with Alembic>=1.7.9 #825

Merged
merged 2 commits into from
May 30, 2019
Merged

Fix compatibility for AbcCoreOgawa::ReadArchive with Alembic>=1.7.9 #825

merged 2 commits into from
May 30, 2019

Conversation

charlesfleche
Copy link
Contributor

Description of Change(s)

Alembic 1.7.9 introduced an API change in Alembic::AbcCoreOgawa::ReadArchive: a new boolean argument is required. This PR conforms to the new function signature for Alembic >= 1.7.9

The behavior of Alembic::AbcCoreOgawa::ReadArchive can be configured by a new environment variable: USD_ABC_READ_ARCHIVE_USE_MMAP
By default, Alembic::AbcCoreOgawa::ReadArchive keep on using the pre 1.7.9 behavior

Fixes Issue(s)

@jilliene
Copy link

Filed as internal issue #USD-5231

#if ALEMBIC_LIBRARY_VERSION >= 10709
TF_DEFINE_ENV_SETTING(
USD_ABC_READ_ARCHIVE_USE_MMAP, false,
"Collapse Xforms containing a single geometry into a single geom Prim in USD");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please update the help string?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry to have let this one slip. Fix is pushed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

@@ -95,6 +95,12 @@ TF_DEFINE_ENV_SETTING(
USD_ABC_XFORM_PRIM_COLLAPSE, true,
"Collapse Xforms containing a single geometry into a single geom Prim in USD");

#if ALEMBIC_LIBRARY_VERSION >= 10709
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about updating FindAlembic to generate this automatically?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now we would need to define ALEMBIC_LIBRARY_VERSION manually but the FindAlembic cmake module could have some logic included to set it automatically when it finds the libraries. Just an idea though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I'm mistaken ALEMBIC_LIBRARY_VERSION is defined in the Alembic headers.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pixar-oss pixar-oss merged commit 4f5601e into PixarAnimationStudios:dev May 30, 2019
pixar-oss added a commit that referenced this pull request May 30, 2019
…mbic

Fix compatibility for AbcCoreOgawa::ReadArchive with Alembic>=1.7.9

(Internal change: 1973396)
@pmolodo pmolodo mentioned this pull request Jun 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants