diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-10 15:17:45 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-10 15:17:45 -0700 |
| commit | 9d73f625ab72e38db707570171da0e6499eaa6aa (patch) | |
| tree | 9f51896ae8db3444429d508a26f9a30309a50e81 | |
| parent | fe077cfba61902c25e470d2727185cb99e50f8ad (diff) | |
NORSPEC-252 fix reverting normal maps to none
| -rwxr-xr-x | indra/newview/llpanelface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 30ccbeb917..f40ff30f51 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -317,8 +317,6 @@ void LLPanelFace::sendTexture() void LLPanelFace::sendBump(U32 bumpiness) { LLTextureCtrl* bumpytexture_ctrl = getChild<LLTextureCtrl>("bumpytexture control"); - LLUUID current_normal_map = bumpytexture_ctrl->getImageAssetID(); - if (bumpiness < BUMPY_TEXTURE) { LL_DEBUGS("Materials") << "clearing bumptexture control" << LL_ENDL; @@ -330,6 +328,8 @@ void LLPanelFace::sendBump(U32 bumpiness) LLSelectMgr::getInstance()->selectionSetBumpmap( bump ); updateBumpyControls(bumpiness == BUMPY_TEXTURE, true); + + LLUUID current_normal_map = bumpytexture_ctrl->getImageAssetID(); LLSelectedTEMaterial::setNormalID(this, current_normal_map); } |