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

Workaround for USD Issue 2013 #2569

Merged
merged 2 commits into from
Aug 31, 2022
+29 −6
Merged

Workaround for USD Issue 2013 #2569

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f14bf
Workaround for USD Issue 2013
JGamache-autodesk Aug 26, 2022
35b4ab1
Change from review comment
JGamache-autodesk Aug 29, 2022
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: 29 additions & 6 deletions lib/mayaUsd/ufe/UsdConnectionHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,20 @@ _GetShaderNodeDef(const PXR_NS::UsdPrim& prim, const PXR_NS::TfToken& attrName)
return registry.GetShaderNodeByIdentifier(srcInfoId);
}

void _SendStrongConnectionChangeNotification(const UsdPrim& usdPrim)
{
// See https://github.com/PixarAnimationStudios/USD/issues/2013 for details.
//
// The notification sent on connection change is not strong enough to force a Hydra resync of
// the material, which forces a resync of the dependent geometries. This means the list of
// primvars required by the material will not be updated on those geometries. Play a trick on
// the stage that generates a stronger notification so the primvars get properly rescanned.
const TfToken waToken("Issue_2013_Notif_Workaround");
SdfPath waPath = usdPrim.GetPath().AppendChild(waToken);
usdPrim.GetStage()->DefinePrim(waPath);
usdPrim.GetStage()->RemovePrim(waPath);
}

} // namespace

UsdConnectionHandler::UsdConnectionHandler()
Expand Down Expand Up @@ -151,23 +165,25 @@ bool UsdConnectionHandler::createConnection(
std::tie(dstBaseName, dstAttrType)
= UsdShadeUtils::GetBaseNameAndType(TfToken(dstAttr->name()));

bool retVal = false;

if (srcAttrType == UsdShadeAttributeType::Input) {
UsdShadeInput srcInput = srcApi.CreateInput(srcBaseName, srcUsdAttr->usdAttributeType());
if (dstAttrType == UsdShadeAttributeType::Input) {
UsdShadeInput dstInput
= dstApi.CreateInput(dstBaseName, dstUsdAttr->usdAttributeType());
return UsdShadeConnectableAPI::ConnectToSource(dstInput, srcInput);
retVal = UsdShadeConnectableAPI::ConnectToSource(dstInput, srcInput);
} else {
UsdShadeOutput dstOutput
= dstApi.CreateOutput(dstBaseName, dstUsdAttr->usdAttributeType());
return UsdShadeConnectableAPI::ConnectToSource(dstOutput, srcInput);
retVal = UsdShadeConnectableAPI::ConnectToSource(dstOutput, srcInput);
}
} else {
UsdShadeOutput srcOutput = srcApi.CreateOutput(srcBaseName, srcUsdAttr->usdAttributeType());
if (dstAttrType == UsdShadeAttributeType::Input) {
UsdShadeInput dstInput
= dstApi.CreateInput(dstBaseName, dstUsdAttr->usdAttributeType());
return UsdShadeConnectableAPI::ConnectToSource(dstInput, srcOutput);
retVal = UsdShadeConnectableAPI::ConnectToSource(dstInput, srcOutput);
} else {
UsdShadeOutput dstOutput;
UsdShadeMaterial dstMaterial(dstUsdAttr->usdPrim());
Expand All @@ -193,12 +209,15 @@ bool UsdConnectionHandler::createConnection(
} else {
dstOutput = dstApi.CreateOutput(dstBaseName, dstUsdAttr->usdAttributeType());
}
return UsdShadeConnectableAPI::ConnectToSource(dstOutput, srcOutput);
retVal = UsdShadeConnectableAPI::ConnectToSource(dstOutput, srcOutput);
}
}

// Return a failure.
return false;
if (retVal) {
_SendStrongConnectionChangeNotification(dstApi.GetPrim());
}

return retVal;
}

bool UsdConnectionHandler::deleteConnection(
Expand Down Expand Up @@ -243,6 +262,10 @@ bool UsdConnectionHandler::deleteConnection(
}
}

if (retVal) {
_SendStrongConnectionChangeNotification(dstUsdAttr->usdPrim());
}

return retVal;
}

Expand Down