diff --git a/doc/build.md b/doc/build.md index a769c4d4a5..b89fbd5b5c 100644 --- a/doc/build.md +++ b/doc/build.md @@ -33,7 +33,7 @@ See Pixar's official github page for instructions on how to build USD: https://g | | ![](images/pxr.png) | |:------------: |:---------------: | -| CommitID/Tags | master: [v19.07](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.07) or [v19.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.11) or [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02)
dev: [40c813](https://github.com/PixarAnimationStudios/USD/commit/40c813421425c47aa84f4572b4798fbb3430984e) | +| CommitID/Tags | master: [v19.07](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.07) or [v19.11](https://github.com/PixarAnimationStudios/USD/releases/tag/v19.11) or [v20.02](https://github.com/PixarAnimationStudios/USD/releases/tag/v20.02)
dev: [893c8e4](https://github.com/PixarAnimationStudios/USD/commit/893c8e4cc4d45fb3e7364369d7767602de411120) | For additional information on building Pixar USD, see the ***Additional Build Instruction*** section below. diff --git a/lib/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/render/vp2RenderDelegate/proxyRenderDelegate.cpp index f0ed41e1c3..76b5a7ca34 100644 --- a/lib/render/vp2RenderDelegate/proxyRenderDelegate.cpp +++ b/lib/render/vp2RenderDelegate/proxyRenderDelegate.cpp @@ -621,11 +621,13 @@ void ProxyRenderDelegate::_FilterSelection() continue; } - const SdfPath usdPath(segments[1].string()); - const SdfPath idxPath(_sceneDelegate->ConvertCachePathToIndexPath(usdPath)); + SdfPath usdPath(segments[1].string()); +#if !defined(USD_IMAGING_API_VERSION) || USD_IMAGING_API_VERSION < 11 + usdPath = _sceneDelegate->ConvertCachePathToIndexPath(usdPath); +#endif _sceneDelegate->PopulateSelection(HdSelection::HighlightModeSelect, - idxPath, UsdImagingDelegate::ALL_INSTANCES, _selection); + usdPath, UsdImagingDelegate::ALL_INSTANCES, _selection); } #endif } diff --git a/lib/usd/hdMaya/adapters/proxyAdapter.cpp b/lib/usd/hdMaya/adapters/proxyAdapter.cpp index 69744f73ed..36fcacad2f 100644 --- a/lib/usd/hdMaya/adapters/proxyAdapter.cpp +++ b/lib/usd/hdMaya/adapters/proxyAdapter.cpp @@ -134,7 +134,11 @@ void HdMayaProxyAdapter::PopulateSelectedPaths( // First, we check to see if the entire proxy shape is selected if (selectedDag.node() == proxyMObj) { +#if defined(USD_IMAGING_API_VERSION) && USD_IMAGING_API_VERSION >= 11 + selectedSdfPaths.push_back(sdfPath::AbsoluteRootPath()); +#else selectedSdfPaths.push_back(_usdDelegate->GetDelegateID()); +#endif _usdDelegate->PopulateSelection( HdSelection::HighlightModeSelect, selectedSdfPaths.back(), UsdImagingDelegate::ALL_INSTANCES, selection);