Skip to content
Snippets Groups Projects
Commit b3384a05 authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-20228 When a reflection probe is unchecked in a link set, it should stop being phantom

parent 901de39c
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
......@@ -764,7 +764,20 @@ void LLPanelVolume::sendIsReflectionProbe()
}
else
{
LLNotificationsUtil::add("CantSelectReflectionProbe");
if (value)
{
LLNotificationsUtil::add("CantSelectReflectionProbe");
}
else if (objectp->flagPhantom())
{
LLViewerObject* root = objectp->getRootEdit();
bool in_linkeset = root != objectp || objectp->numChildren() > 0;
if (in_linkeset)
{
// In linkset with a phantom flag
objectp->setFlags(FLAGS_PHANTOM, FALSE);
}
}
volobjp->setIsReflectionProbe(value);
}
}
......@@ -1213,6 +1226,17 @@ void LLPanelVolume::onPasteLight()
}
else
{
if (objectp->flagPhantom())
{
LLViewerObject* root = objectp->getRootEdit();
bool in_linkeset = root != objectp || objectp->numChildren() > 0;
if (in_linkeset)
{
// In linkset with a phantom flag
objectp->setFlags(FLAGS_PHANTOM, FALSE);
}
}
volobjp->setIsReflectionProbe(false);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment