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.

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

Jump to bottom

Fix sizing of result array when calling GetScenePrimPaths with some invalid instance indices #2960

Merged
merged 2 commits into from
Apr 20, 2024
Merged

Fix sizing of result array when calling GetScenePrimPaths with some invalid instance indices #2960

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29804a2
Fix sizing of result array when calling GetScenePrimPaths with some i…
marktucker Feb 17, 2024
732fe33
Ensure the output result vector from GetScenePrimPaths is the same le…
marktucker Feb 22, 2024
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
5 changes: 4 additions & 1 deletion pxr/usdImaging/usdImaging/instanceAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2654,6 +2654,10 @@ UsdImagingInstanceAdapter::GetScenePrimPaths(
}
}

// Ensure the result vector is the same size as instanceIndices
// even if there are no valid instance indices.
result.resize(instanceIndices.size());

// at least one index was valid, get the prim paths
if (validIndices > 0) {
// For each valid requested index provide a mapping into the result vector
Expand All @@ -2674,7 +2678,6 @@ UsdImagingInstanceAdapter::GetScenePrimPaths(
}
}

result.resize(validIndices);
_GetScenePrimPathsFn primPathsFn(
this, requestedIndicesMap, minIdx, result, proto.path);
_RunForAllInstancesToDraw(instancerPrim, &primPathsFn);
Expand Down