diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-07-01 10:59:46 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-07-01 10:59:46 -0500 |
| commit | d262ca32d3b80803595fcc3f61f008786125250d (patch) | |
| tree | ab7b8e13920b309321390f41c663b775f162b0c7 /indra/newview/llvovolume.cpp | |
| parent | bd41392b7ec1dd90cd0039d87bbbef8beda1796a (diff) | |
| parent | 1c9a4fc080bee955b5b18750fe8de7c24a3f912f (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index b84b215f33..4835ffcd8f 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5488,7 +5488,7 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFac mode == LLMaterial::DIFFUSE_ALPHA_MODE_EMISSIVE; } - bool use_legacy_bump = te->getBumpmap() && (!mat || mat->getNormalID().isNull()); + bool use_legacy_bump = te->getBumpmap() && (te->getBumpmap() < 18) && (!mat || mat->getNormalID().isNull()); if (mat && LLPipeline::sRenderDeferred && !hud_group) { |