Skip to content

Handle missing light-link values #12

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

Open
nicolaspopravka wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −3
Open

Handle missing light-link values #12

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
15 changes: 12 additions & 3 deletions lib/hydramoonray/Light.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,12 @@ Light::Sync(pxr::HdSceneDelegate *sceneDelegate,
// Value is either "" or "<id>.collection:lightLink" though this will allow others.
// Currently Finalize() is called when value changes, but this may be a bug.
bool categoriesChanged = false;
pxr::TfToken t =
sceneDelegate->GetLightParamValue(id, pxr::HdTokens->lightLink).Get<pxr::TfToken>();
pxr::VtValue value =
sceneDelegate->GetLightParamValue(id, pxr::HdTokens->lightLink);
pxr::TfToken t;
if (value.IsHolding<pxr::TfToken>()) {
t = value.UncheckedGet<pxr::TfToken>();
}
// registering the category id token with RenderDelegate will enable geometry
// to look up mLight as the rdl2 scene object corresponding to this category id
if (initialize || t != mLightLinkCategory) {
Expand All @@ -417,7 +421,12 @@ Light::Sync(pxr::HdSceneDelegate *sceneDelegate,
categoriesChanged = true;
}
// "shadowLink" is much the same
t = sceneDelegate->GetLightParamValue(id, pxr::HdTokens->shadowLink).Get<pxr::TfToken>();
value = sceneDelegate->GetLightParamValue(id, pxr::HdTokens->shadowLink);
if (value.IsHolding<pxr::TfToken>()) {
t = value.UncheckedGet<pxr::TfToken>();
} else {
t = pxr::TfToken();
}
if (initialize || t != mShadowLinkCategory) {
if (!initialize) {
renderDelegate.releaseCategory(mLight, RenderDelegate::CategoryType::ShadowLink, mShadowLinkCategory);
Expand Down