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

NORSPEC-260 fix issues with OK after pressing none being intepreted as add a null normal map

meow-7.2.2
Graham Madarasz 2013-06-12 15:01:23 -07:00
parent b60ea52902
commit 8ad2c0b8fb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelface.cpp
View File

@ -1817,7 +1817,8 @@ void LLPanelFace::onCommitSpecularTexture( const LLSD& data )
void LLPanelFace::onCommitNormalTexture( const LLSD& data )
{
LL_DEBUGS("Materials") << data << LL_ENDL;
sendBump(BUMPY_TEXTURE);
LLUUID nmap_id = getCurrentNormalMap();
sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
}
void LLPanelFace::onCancelSpecularTexture(const LLSD& data)
@ -1847,7 +1848,8 @@ void LLPanelFace::onSelectSpecularTexture(const LLSD& data)
void LLPanelFace::onSelectNormalTexture(const LLSD& data)
{
LL_DEBUGS("Materials") << data << LL_ENDL;
sendBump(BUMPY_TEXTURE);
LLUUID nmap_id = getCurrentNormalMap();
sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
}
//static

2
indra/newview/llpanelface.h
View File

@ -300,7 +300,7 @@ private:
if (tep)
{
material_ptr = tep->getMaterialParams();
if (!material_ptr.isNull() && !tep->getMaterialID().isNull())
if (!material_ptr.isNull())
{
ret = (material_ptr->*(MaterialGetFunc))();
}