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

Updating AL_USDMaya to work with usd-0.19.1 #133

Merged
merged 3 commits into from
Feb 18, 2019

Conversation

sirpalee
Copy link
Contributor

@sirpalee sirpalee commented Dec 7, 2018

Description (this won't be part of the changelog)

The following PR updates the plugin to work with the latest changes found on the dev branch. The changes won't build, because of UsdImagingGLEngine::TestIntersectionBatch was removed, without any alternative. For now, I left that piece of code unchanged.

Changelog

These entries will be used to update the changelog.

Use Markdown list syntax for each entry.

Filled out fields will be added to the changelog.

Added

Added support for 0.19.1 version of USD.

Changed

Deprecated

Removed

Removed support for 0.18.11 version of USD.

Fixed

Checklist (Please do not remove this line)

  • Make sure the Title and Description of the PR make sense and provide sufficient context for your work
  • Do any added files have the correct AL Apache Licence Header?
  • Are there Doxygen comments in the headers?
  • Are any new features, behaviour changes documented in the .md format documentation?
  • Have you added, updated tests to cover new features and behaviour changes?
  • Have you filled out at least one changelog entry?

@sirpalee
Copy link
Contributor Author

sirpalee commented Dec 7, 2018

Added a quick take on subclassing UsdImagingGLEngine as discussed in # 133. It's not tested, formatted or has its functions exported properly for now.

@sirpalee
Copy link
Contributor Author

Updated formatting to match the rest of the codebase and ran some tests. Everything works as expected.

I'm not sure about the best place for "Engine", for now, I put it into the nodes subfolder since it's not really used anywhere else. Also, since it contains code copied directly from UsdImagingGL, should I add the Pixar copyright headers to Engine.cpp?

@murphyeoin
Copy link
Contributor

@sirpalee thanks for all of your hard work here, we're a bit tardy on approvals at the moment (I'm going to blame Australian summer holidays), we're waiting to have our own 19.01 build working internally to allow us to test this..

@pmolodo pmolodo force-pushed the pr/usd-0.19.1-update branch from 1bfffec to f4bdddc Compare January 22, 2019 01:42
@fabal
Copy link
Collaborator

fabal commented Jan 25, 2019

Thanks @sirpalee , just two things:

  • could you keep only changes related to this PR and remove other ones?
  • would you mind changing the base branch from master to develop?
    Once done, we are now ready to merge your work.

@sirpalee sirpalee changed the base branch from master to develop January 28, 2019 00:00
@sirpalee
Copy link
Contributor Author

@fabal Rebased! Now it should only contain changes that are required to make AL_USDMaya compatible with usd-0.19.1.

@fabal
Copy link
Collaborator

fabal commented Jan 28, 2019

Awesome, thanks.

@pmolodo
Copy link
Contributor

pmolodo commented Feb 11, 2019

Cleaned up the commit history a bit and rebased, if you haven't already merged this...

@b0ssi
Copy link
Contributor

b0ssi commented Feb 18, 2019

Thanks @elrond79, we will be merging this shortly.

@b0ssi b0ssi merged commit bcdce47 into AnimalLogic:develop Feb 18, 2019
@b0ssi b0ssi mentioned this pull request Feb 18, 2019
6 tasks
b0ssi pushed a commit that referenced this pull request Feb 21, 2019
* Update with changes in the new release
* Add some manual updates to make the comments clearer
* Add notes for public PRs #133, #137
@pmolodo pmolodo deleted the pr/usd-0.19.1-update branch October 21, 2019 21:25
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.

5 participants