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

MAYA-105120 Hide MRenderItems created for instancers with zero instances. #570

Merged
merged 3 commits into from
Jun 9, 2020
Merged

MAYA-105120 Hide MRenderItems created for instancers with zero instances. #570

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b370fe
Hide MRenderItems created for instancers with zero instances.
Jun 8, 2020
15e4422
Protect bitwise & with parentheses.
Jun 8, 2020
2661c4e
Add changes for basisCurves. Always set the visibility for instanced …
Jun 8, 2020
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
17 changes: 12 additions & 5 deletions lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,9 @@ void HdVP2Mesh::_UpdateDrawItem(
// The current instancer invalidation tracking makes it hard for
// us to tell whether transforms will be dirty, so this code
// pulls them every time something changes.
// If the mesh is instanced but have 0 instance transforms remember that
// so the render item can be hidden.
bool instancerWithNoInstances = false;
if (!GetInstancerId().IsEmpty()) {

// Retrieve instance transforms from the instancer.
Expand All @@ -1275,10 +1278,14 @@ void HdVP2Mesh::_UpdateDrawItem(
ComputeInstanceTransforms(id);

MMatrix instanceMatrix;
const unsigned int instanceCount = transforms.size();

if (isDedicatedSelectionHighlightItem) {
if (0 == instanceCount) {
instancerWithNoInstances = true;
}
else if (isDedicatedSelectionHighlightItem) {
if (_selectionState == kFullySelected) {
stateToCommit._instanceTransforms.setLength(transforms.size());
stateToCommit._instanceTransforms.setLength(instanceCount);
for (size_t i = 0; i < transforms.size(); ++i) {
transforms[i].Get(instanceMatrix.matrix);
instanceMatrix = worldMatrix * instanceMatrix;
Expand All @@ -1296,7 +1303,6 @@ void HdVP2Mesh::_UpdateDrawItem(
}
}
else {
const unsigned int instanceCount = transforms.size();
stateToCommit._instanceTransforms.setLength(instanceCount);
for (size_t i = 0; i < instanceCount; ++i) {
transforms[i].Get(instanceMatrix.matrix);
Expand Down Expand Up @@ -1356,8 +1362,9 @@ void HdVP2Mesh::_UpdateDrawItem(
HdChangeTracker::DirtyRenderTag |
HdChangeTracker::DirtyPoints |
HdChangeTracker::DirtyExtent |
DirtySelectionHighlight)) {
bool enable = drawItem->GetVisible() && !_meshSharedData._points.empty();
DirtySelectionHighlight) ||
instancerWithNoInstances) {
bool enable = drawItem->GetVisible() && !_meshSharedData._points.empty() && !instancerWithNoInstances;

if (isDedicatedSelectionHighlightItem) {
enable = enable && (_selectionState != kUnselected);
Expand Down