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

Fix build failure from warning and dav3p no-JIRA bug about normal map scale editing

meow-7.2.2
Graham Madarasz 2013-06-11 13:54:03 -07:00
parent 87946113cc
commit 7fcbb7c177
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llpanelface.cpp
View File

@ -772,10 +772,6 @@ void LLPanelFace::updateUI()
// Normal map
LLSelectedTEMaterial::getNormalID(normmap_id, identical_norm);
if (bumpy != BUMPY_TEXTURE)
{
normmap_id = LLUUID::null;
}
mIsAlpha = FALSE;
LLGLenum image_format = GL_RGB;
@ -2318,8 +2314,6 @@ void LLPanelFace::LLSelectedTEMaterial::getCurrentDiffuseAlphaMode(U8& diffuse_a
identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &get_diff_mode, diffuse_alpha_mode);
}
static void getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical);
void LLPanelFace::LLSelectedTE::getObjectScaleS(F32& scale_s, bool& identical)
{
struct LLSelectedTEGetObjectScaleS : public LLSelectedTEGetFunctor<F32>