Replace callsites into deprecated "Master" API #1430
Conversation
lib/mayaUsd/fileio/jobs/readJob.cpp
Outdated
| @@ -56,7 +56,7 @@ | |||
| #include <maya/MStatus.h> | |||
| #include <maya/MTime.h> | |||
|
|
|||
| #include <ghc/filesystem.hpp> | |||
| #include <boost/filesystem.hpp> | |||
There was a problem hiding this comment.
@dj-mcg Could you clarify why you needed to make this change here? In fact, This PR should not compile at all on any platforms since we no longer support boost::filesystem.
There was a problem hiding this comment.
This was an oversight on my part. We change these internally since we still use boost, so this didn't show up in the diff I was looking at. I've corrected it
| } | ||
| } | ||
| deleteMasterMod.doIt(); | ||
| deletePrototypeMod.doIt(); |
There was a problem hiding this comment.
I found both masterObject and prototypeObject confusing. Are they not just "instance objects"? I think having a more generic name would be better.
There was a problem hiding this comment.
I've made the other changes as it breaks functionality, but I've left this for now since it's a style preference. If you feel strongly about changing the var names, I can raise it with the USD team. Please let me know.
| @@ -179,7 +184,7 @@ UsdPrim TransformIterator::parentPrim() const | |||
| UsdPrim parentPrim = m_stage->GetPseudoRoot(); | |||
| if (m_primStack.size() > 1) { | |||
| parentPrim = (m_primStack.end() - 2)->m_prim; | |||
| if (parentPrim.IsMaster()) { | |||
| if (parentPrim.IsPrototype()) { | |||
There was a problem hiding this comment.
There is no guard against PXR_VERSION < 2011?
There was a problem hiding this comment.
Nice catch, thank you, this was my fault for not testing thoroughly enough before pushing. I'll make sure to start building and testing against both USD's release version and latest version prior to opening a pull request.
|
Oh thanks - looks like the USD folks sent me these changes, but they include some that shouldn't be pushed. Let me clean them up a bit and push again. |
|
Thank you for catching these, Hamed. I had assumed the author had tested these changes against the open source project but it was only tested internally. I'll make sure to more carefully review the changes that touch mayaUsd before opening a pull request. |
Replace boost header with ghc Check PXR version when using new API in the AL plugin
No description provided.