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

Combined UsdVol schema and Hydra changes #567

Merged

Conversation

marktucker
Copy link
Contributor

This pull request supercedes #514 and #517. It includes all revisions from those pull requests, plus a couple of conflict resolutions, plus a large number of changes based on feedback from the USD team. This PR is not yet complete, with more changes on the Hydra side likely still to come.

PrimAdapter classes. Currently they are all default implementations
that return nothing.

# Conflicts:
#	pxr/imaging/lib/hd/sceneDelegate.h
speicalizations for openvdb asset and field3d asset primitives).

# Conflicts:
#	pxr/imaging/lib/hd/tokens.h
 * Remove unnecessary includes, update copyright years.
 * Re-ran genUsdSchema to pick up latest changes to schema files.
 * Added some helper functions to UsdVolVolume to make managing field
relationships easier.
 * Use this new API to help populate information in the volume adapter.
@jtran56
Copy link

jtran56 commented Jul 20, 2018

Filed as internal issue #163093.

@pixar-oss pixar-oss merged commit 98233d9 into PixarAnimationStudios:dev Sep 7, 2018
pixar-oss added a commit that referenced this pull request Sep 7, 2018
Combined UsdVol schema and Hydra changes

(Internal change: 1890691)
@marktucker marktucker deleted the dev_usdvol_combined branch September 8, 2018 04:10
AdamFelt pushed a commit to autodesk-forks/USD that referenced this pull request Apr 16, 2024
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.

4 participants