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

support for MaterialX-1.38.1 #1633

Merged
merged 1 commit into from Nov 5, 2021

Conversation

pmolodo
Copy link
Contributor

@pmolodo pmolodo commented Sep 29, 2021

Description of Change(s)

Allows building against MaterialX-1.38.1 or 1.38.0

1.38.1 changes the return type of getShaderNodes from an unordered_set to a vector.

I use auto to handle this - I know auto isn't generally encouraged at Pixar, but since MaterialX apparently provides no way to tell the version at compile time, #define isn't an option (and I didn't want to use run-time branching, which would result in a lot of duplicated code!)

Fixes Issue(s)

  • Building against MaterialX-1.38.1

@jilliene
Copy link

Filed as internal issue #USD-6929

@pixar-oss pixar-oss merged commit ecc1ead into PixarAnimationStudios:dev Nov 5, 2021
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.

None yet

3 participants