apply updates to comply with recent core USD dev branch commits #402
Conversation
|
@mattyjams I think we will wait for 20.05 to be out of the door before adopting this change. Does it work for you? |
|
@kxl-adsk: Internally, we're ok with that, as we're already merging these changes into the branch we build for deployment at Pixar. This is more for the benefit of other users/studios who might be trying to build against the dev branch of core USD. We've fielded a bunch of queries already asking about the USD dev branch having broken maya-usd, and we're having to point them at this PR and #395. So the sooner we can get this in, the better really. |
| @@ -537,10 +537,14 @@ bool ProxyRenderDelegate::getInstancedSelectionPath( | |||
| // therefore drawInstID is usdInstID plus 1 considering VP2 defines the | |||
| // instance ID of the first instance as 1. | |||
| const int drawInstID = intersection.instanceID(); | |||
| const int usdInstID = drawInstID - 1; | |||
| #if defined(USD_IMAGING_API_VERSION) && USD_IMAGING_API_VERSION >= 13 | |||
There was a problem hiding this comment.
Is there any user-visible change using the new code?
There was a problem hiding this comment.
@HdC-adsk: No, there should be no change in what gets drawn in the viewport. This was just cleaning up the API around querying scene delegates for an instancer's prim path.
There's more detail on the core USD change that goes with this here:
PixarAnimationStudios/OpenUSD@82e343c
e608348 to
e889642
Compare
|
Rebased following the merge of #388. |
e889642 to
9f48ecb
Compare
|
Updated build.md to reflect that core USD release 20.05 is supported. |
|
@mattyjams I have built USD 20.05 locally on Windows and needed to make some extra changes on top of yours to get everything to build. All these boost changes are because (on Windows) the version was changed from 1.65.1 to 1.70.0. I've attached a patch file of my changes here: FYI, one of the errors I got was this, which is fixed by adding the build flag: HAVE_SNPRINTF. Would you prefer to incorporate these changes into your PR, or should I create my own PR? Thanks, Sean |
These changes further clean up confusion around prim paths and improve the API in UsdImaging to provide functionality that some client code was attempting to implement itself. See the original core USD commit message for more details. This change corresponds to core USD commit 82e343c42b730a3674a766aab6be1b4f1c0ca9ef (Internal change: 2051666)
This change corresponds to core USD commit 310d9fbc2786b9ec5a3278c033b16ce713b92f49 (Internal change: 2051759)
This change is a prerequisite for core USD commit b0fc236ac695b6c66de50897356209ed7c21865a (Internal change: 2051913)
…red_ptr This change corresponds to core USD commit eff8cb850e44aab0d6afa89c80706e88984fefe6 (Internal changes: 2052274, 2052288)
This identifies core USD release 20.05 as a supported release of USD, as well as its corresponding core USD dev branch commit: PixarAnimationStudios/OpenUSD@6af4d8a
Boost support for Visual Studio 2019 was added in version 1.70.0, so this core USD commit upgraded the build_usd.py script to use that version: PixarAnimationStudios/OpenUSD@7f64522 These changes courtesy of seando-adsk address building maya-usd with that version of Boost on Windows.
9f48ecb to
fb2f13f
Compare
|
Ahh, good catch, thanks @seando-adsk! I just applied that patch to the change branch, so those changes should be present in fb2f13f. |
|
@mattyjams Sorry we found a problem when building on the Mac. Could you add in this one extra patch. Thanks, Sean |
An additional build fix courtesy of seando-adsk.
470bf0a to
4eb3d23
Compare
No problem. Just pushed that as commit 4eb3d23. |
There was a problem hiding this comment.
So all works fine with 20.02 and 20.05 on my end. But this change doesn't compile with 19.11.
Changes in HdMaya, around materials are breaking support with 19.11
maya-usd_pr\lib\usd\hdMaya\adapters\materialAdapter.cpp(168): error C2039: 'param': is not a member of 'pxrInternal_v0_19__pxrReserved__::HdMayaShaderParam'
* HYDRA-324: remove support scene index in charge of the highlight * HYDRA-324: dispatch notification * HYDRA-324: remove unused header * HYDRA-324: fix func sign mismatch * HYDRA-324: return early if every scene indices are involved * HYDRA-324: return early if every scene indices are involved * HYDRA-324: return early if every scene indices are involved * HYDRA-324: add missing empty line * HYDRA-324: add markdown documentation * HYDRA-324: add detailled documentation link * HYDRA-324: remove ufe selection observer * HYDRA-324: remove sel handl doc from .md
In particular, this PR absorbs the following core USD commits:
PixarAnimationStudios/OpenUSD@82e343c
PixarAnimationStudios/OpenUSD@310d9fb
PixarAnimationStudios/OpenUSD@b0fc236
PixarAnimationStudios/OpenUSD@eff8cb8
I updated build.md to reflect that the most recent core USD commit supported by maya-usd is the one currently on the tip of the core USD dev branch (PixarAnimationStudios/OpenUSD@8dcbcc9).
Note that #395 is also required if you want to build the maya-usd dev branch against the core USD dev branch.