diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-11 11:45:11 -0700 |
| commit | 0f608cb764856ae8586a9d9631842a782cb70a23 (patch) | |
| tree | 97a12c3bfcc14ae73df00c68141e9519493a0619 /indra/newview/llvovolume.cpp | |
| parent | 97da85de0b1e0f8c2fc60c156c31b237b869230a (diff) | |
| parent | 4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 7d6881f8a8..d4c8d4f923 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2152,7 +2152,7 @@ bool LLVOVolume::notifyAboutMissingAsset(LLViewerTexture *texture) switch(range_it->second.map) { - case LLRender::DIFFUSE_MAP: + case LLRender::DIFFUSE_MAP: { if(LLMaterial::DIFFUSE_ALPHA_MODE_NONE != cur_material->getDiffuseAlphaMode()) { //missing texture + !LLMaterial::DIFFUSE_ALPHA_MODE_NONE => LLMaterial::DIFFUSE_ALPHA_MODE_NONE @@ -2194,9 +2194,8 @@ bool LLVOVolume::notifyAboutMissingAsset(LLViewerTexture *texture) mat->setSpecularID(LLUUID::null); } break; - case LLRender::NUM_TEXTURE_CHANNELS: - //nothing to do, make compiler happy - break; + default: + break; } //switch } //for |