diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-11 08:50:44 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-11 08:50:44 -0700 |
| commit | c93354cfcfaaf2cffc21b9a981f7b39123672985 (patch) | |
| tree | 6ce5ac20ce48d9f3c5e8aad7b44e132f77dc4251 /indra/newview | |
| parent | e34f088104af64bf4468ff0d2f525a898f531bfb (diff) | |
| parent | 9c1b45b16763d452a3c9175186217d005a9cfd2b (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index 86642e5635..562d293d56 100755 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -282,6 +282,7 @@ private: if ((new_alpha_mode == LLMaterial::DIFFUSE_ALPHA_MODE_BLEND) && !is_alpha_face) { new_alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE; + new_material->setDiffuseAlphaMode(LLMaterial::DIFFUSE_ALPHA_MODE_NONE); } bool is_default_blend_mode = (new_alpha_mode == default_alpha_mode); |