Skip to content

Fix point instancer crash #4281

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.

Sign up for GitHub

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

Draft
pierrebai-adsk wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Fix point instancer crash #4281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,15 +776,32 @@ void MayaUsdRPrim::_SyncDisplayLayerModes(SdfPath const& id, bool instancedPrim)
_displayLayerModesFrame = drawScene.GetFrameCounter();

// Obtain scene prim path
HdInstancerContext instancerContext;
int instanceIndex = instancedPrim ? 0 : UsdImagingDelegate::ALL_INSTANCES;
auto usdPath = drawScene.GetScenePrimPath(id, instanceIndex, &instancerContext);

// Native instances use per-instance _displayLayerModes
if (instancedPrim && instancerContext.empty()) {
_useInstancedDisplayLayerModes = true;
_displayLayerModes = DisplayLayerModes();
return;
SdfPath usdPath;

if (instancedPrim) {
auto delegate = drawScene.GetUsdImagingDelegate();
auto instancerId = delegate->GetInstancerId(id);

VtIntArray indices = delegate->GetInstanceIndices(instancerId, id);
const int instanceIndex = indices.empty() ? 0 : indices[0];

// The additional condition below is to prevent a crash in USD function GetScenePrimPath
bool instanced = !instancerId.IsEmpty();
instanced = (instanced && !indices.empty());

HdInstancerContext instancerContext;
usdPath = instanced ? drawScene.GetScenePrimPath(id, instanceIndex, &instancerContext)
: SdfPath();

// Native instances use per-instance _displayLayerModes
if (instancerContext.empty()) {
_useInstancedDisplayLayerModes = true;
_displayLayerModes = DisplayLayerModes();
return;
}
} else {
const int instanceIndex = UsdImagingDelegate::ALL_INSTANCES;
usdPath = drawScene.GetScenePrimPath(id, instanceIndex, nullptr);
}

// Otherwise, populate display layer modes
Expand Down