livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BP texture picker applying texture to the wrong material channel when different transforms tab is open

master
Zi Ree 2024-06-14 17:26:28 +02:00
parent c27cf95b91
commit 2d0c807daf
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/fspanelface.cpp
View File

@ -3606,6 +3606,9 @@ void FSPanelFace::onCommitTexture()
LL_WARNS() << "onCommitTexture" << LL_ENDL;
add(LLStatViewer::EDIT_TEXTURE, 1);
// appying the texture relies on the tab control showing the correct channel
selectMatChannel(MATTYPE_DIFFUSE);
LLSelectMgr::getInstance()->saveSelectedObjectTextures();
sendTexture();
@ -3641,12 +3644,19 @@ void FSPanelFace::onCommitTexture()
void FSPanelFace::onCommitNormalTexture()
{
LLUUID nmap_id = getCurrentNormalMap();
// appying the texture relies on the tab control showing the correct channel
selectMatChannel(MATTYPE_NORMAL);
sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
onTextureSelectionChanged(mBumpyTextureCtrl);
}
void FSPanelFace::onCommitSpecularTexture()
{
// appying the texture relies on the tab control showing the correct channel
selectMatChannel(MATTYPE_SPECULAR);
sendShiny(SHINY_TEXTURE);
onTextureSelectionChanged(mShinyTextureCtrl);
}