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

updates from Hdx de-boostification and Hd reorganization #449

Merged
merged 2 commits into from
Apr 21, 2020

Conversation

mattyjams
Copy link
Contributor

Two recent post-20.05 commits in core USD made some Hdx pointer types use std::shared_ptr instead of boost::shared_ptr, and a third commit moved some Hd enum values from hd/enums.h to hd/types.h.

The changes here update the maya-usd code to account for these core USD commits.

…ation

This change corresponds to the following core USD commits:
PixarAnimationStudios/OpenUSD@f3e58ef
PixarAnimationStudios/OpenUSD@e67ea8d

(Internal changes: 2056594, 2056628)
Texture sampling related enums in Hydra were moved from hd/enums.h to
hd/types.h, so this change ensures that hdMaya includes the header that defines
them to protect against further Hydra header reorganization.

This change corresponds to core USD commit
PixarAnimationStudios/OpenUSD@2302bda

(Internal change: 2057373)
@kxl-adsk kxl-adsk added the build Related to building maya-usd repository label Apr 21, 2020
@kxl-adsk
Copy link

@mattyjams We just adopted 20.05 and will stay for a few weeks on it while we deal with python3. I see HDX_API_VERSION guards - we shouldn't have any issue in merging this change even without adopting the latest dev branch?

FWIW. we will have to validate that everything works on our end with the latest dev branch before merging.

@mattyjams
Copy link
Contributor Author

@kxl-adsk: Yeah, that's right. The boost::shared_ptr vs. std::shared_ptr changes are gated by HDX_API_VERSION, so they should be safe with or without everything else from 20.05. And the addition of the extra hd header should be safe too since that's been there in core USD since at least 19.07.

@kxl-adsk kxl-adsk merged commit dc3a141 into Autodesk:dev Apr 21, 2020
@Autodesk Autodesk deleted a comment from AwanPydrall Apr 22, 2020
@Autodesk Autodesk deleted a comment from AwanPydrall Apr 22, 2020
@mattyjams mattyjams deleted the pr/more_pxr_hdx_deboostifying branch April 23, 2020 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to building maya-usd repository
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants